From 608b43292e563e0b07e276b576c5383a3d42d79b Mon Sep 17 00:00:00 2001
From: Carlos Cortizas <97907068+CarlosCortizasCT@users.noreply.github.com>
Date: Mon, 20 Jan 2025 13:46:06 +0100
Subject: [PATCH] Migrate Reference model (#741)

* refactor(common): migrating reference model

* refactor(common): update reference model docs

* chore: changesets added

* fix(commons): adjust imports and exports
---
 .changeset/afraid-pandas-wash.md              |  41 ++++
 .changeset/nervous-weeks-march.md             |   5 +
 models/commons/README.md                      |  28 ++-
 .../commons/src/client-logging/generator.ts   |   2 +-
 .../src/client-logging/transformers.ts        |   2 +-
 .../discounted-price-draft/fields-config.ts   |   2 +-
 .../src/discounted-price/fields-config.ts     |   2 +-
 models/commons/src/index.ts                   |   3 +-
 models/commons/src/reference/builder.spec.ts  |  42 ----
 models/commons/src/reference/builder.ts       |  13 --
 models/commons/src/reference/builders.spec.ts | 122 ++++++++++
 models/commons/src/reference/builders.ts      |  38 +++
 models/commons/src/reference/constants.ts     |   8 +
 models/commons/src/reference/fields-config.ts |  29 +++
 models/commons/src/reference/generator.ts     |  12 -
 models/commons/src/reference/index.ts         |  31 ++-
 .../_shared/reference-presets-builder.spec.ts |  50 ++++
 .../_shared/reference-presets-builder.ts      |  13 ++
 .../presets/associate-role-reference.ts       |   6 +
 .../associate-role-reference.spec.ts          |  10 -
 .../associate-role-reference.ts               |   7 -
 .../reference/presets/associate-role/index.ts |   1 -
 .../presets/attribute-group-reference.ts      |   6 +
 .../attribute-group-reference.spec.ts         |  11 -
 .../attribute-group-reference.ts              |   7 -
 .../presets/attribute-group/index.ts          |   1 -
 .../presets/business-unit-reference.ts        |   6 +
 .../business-unit-reference.spec.ts           |  10 -
 .../business-unit/business-unit-reference.ts  |   7 -
 .../reference/presets/business-unit/index.ts  |   1 -
 .../presets/cart-discount-reference.ts        |   6 +
 .../cart-discount-reference.spec.ts           |  10 -
 .../cart-discount/cart-discount-reference.ts  |   7 -
 .../reference/presets/cart-discount/index.ts  |   1 -
 .../src/reference/presets/cart-reference.ts   |   6 +
 .../presets/cart/cart-reference.spec.ts       |  10 -
 .../reference/presets/cart/cart-reference.ts  |   6 -
 .../src/reference/presets/cart/index.ts       |   1 -
 .../reference/presets/category-reference.ts   |   6 +
 .../category/category-reference.spec.ts       |  10 -
 .../presets/category/category-reference.ts    |   7 -
 .../src/reference/presets/category/index.ts   |   1 -
 .../reference/presets/channel-reference.ts    |   6 +
 .../presets/channel/channel-reference.spec.ts |  10 -
 .../presets/channel/channel-reference.ts      |   6 -
 .../src/reference/presets/channel/index.ts    |   1 -
 .../presets/customer-group-reference.ts       |   6 +
 .../customer-group-reference.spec.ts          |  10 -
 .../customer-group-reference.ts               |   7 -
 .../reference/presets/customer-group/index.ts |   1 -
 .../reference/presets/customer-reference.ts   |   6 +
 .../customer/customer-reference.spec.ts       |  10 -
 .../presets/customer/customer-reference.ts    |   7 -
 .../src/reference/presets/customer/index.ts   |   1 -
 .../presets/direct-discount-reference.ts      |   6 +
 .../direct-discount-reference.spec.ts         |  11 -
 .../direct-discount-reference.ts              |   7 -
 .../presets/direct-discount/index.ts          |   1 -
 .../presets/discount-code-reference.ts        |   6 +
 .../discount-code-reference.spec.ts           |  10 -
 .../discount-code/discount-code-reference.ts  |   7 -
 .../reference/presets/discount-code/index.ts  |   1 -
 .../reference/presets/extension-reference.ts  |   6 +
 .../extension/extension-reference.spec.ts     |  10 -
 .../presets/extension/extension-reference.ts  |   7 -
 .../src/reference/presets/extension/index.ts  |   1 -
 models/commons/src/reference/presets/index.ts | 218 ++++++++++++------
 .../presets/inventory-entry-reference.ts      |   6 +
 .../presets/inventory-entry/index.ts          |   1 -
 .../inventory-entry-reference.spec.ts         |  11 -
 .../inventory-entry-reference.ts              |   7 -
 .../presets/key-value-document-reference.ts   |   6 +
 .../presets/key-value-document/index.ts       |   1 -
 .../key-value-document-reference.spec.ts      |  11 -
 .../key-value-document-reference.ts           |   7 -
 .../reference/presets/order-edit-reference.ts |   6 +
 .../src/reference/presets/order-edit/index.ts |   1 -
 .../order-edit/order-edit-reference.spec.ts   |  10 -
 .../order-edit/order-edit-reference.ts        |   7 -
 .../src/reference/presets/order-reference.ts  |   6 +
 .../src/reference/presets/order/index.ts      |   1 -
 .../presets/order/order-reference.spec.ts     |  10 -
 .../presets/order/order-reference.ts          |   6 -
 .../reference/presets/payment-reference.ts    |   6 +
 .../src/reference/presets/payment/index.ts    |   1 -
 .../presets/payment/payment-reference.spec.ts |  10 -
 .../presets/payment/payment-reference.ts      |   6 -
 .../presets/product-discount-reference.ts     |   6 +
 .../presets/product-discount/index.ts         |   1 -
 .../product-discount-reference.spec.ts        |  11 -
 .../product-discount-reference.ts             |   7 -
 .../presets/product-price-reference.ts        |   6 +
 .../reference/presets/product-price/index.ts  |   1 -
 .../product-price-reference.spec.ts           |  10 -
 .../product-price/product-price-reference.ts  |   7 -
 .../reference/presets/product-reference.ts    |   6 +
 .../presets/product-selection-reference.ts    |   6 +
 .../presets/product-selection/index.ts        |   1 -
 .../product-selection-reference.spec.ts       |  11 -
 .../product-selection-reference.ts            |   7 -
 .../presets/product-type-reference.ts         |   6 +
 .../reference/presets/product-type/index.ts   |   1 -
 .../product-type-reference.spec.ts            |  10 -
 .../product-type/product-type-reference.ts    |   7 -
 .../src/reference/presets/product/index.ts    |   1 -
 .../presets/product/product-reference.spec.ts |  10 -
 .../presets/product/product-reference.ts      |   6 -
 .../src/reference/presets/quote-reference.ts  |   6 +
 .../presets/quote-request-reference.ts        |   6 +
 .../reference/presets/quote-request/index.ts  |   1 -
 .../quote-request/quote-request-reference.ts  |   7 -
 .../quote-request/quote-request.spec.ts       |  10 -
 .../src/reference/presets/quote/index.ts      |   1 -
 .../presets/quote/quote-reference.spec.ts     |  10 -
 .../presets/quote/quote-reference.ts          |   6 -
 .../src/reference/presets/review-reference.ts |   6 +
 .../src/reference/presets/review/index.ts     |   1 -
 .../presets/review/review-reference.spec.ts   |  10 -
 .../presets/review/review-reference.ts        |   6 -
 .../presets/shipping-method-reference.ts      |   6 +
 .../presets/shipping-method/index.ts          |   1 -
 .../shipping-method-reference.spec.ts         |  11 -
 .../shipping-method-reference.ts              |   7 -
 .../presets/shopping-list-reference.ts        |   6 +
 .../reference/presets/shopping-list/index.ts  |   1 -
 .../shopping-list-reference.spec.ts           |  10 -
 .../shopping-list/shopping-list-reference.ts  |   7 -
 .../presets/staged-quote-reference.ts         |   6 +
 .../reference/presets/staged-quote/index.ts   |   1 -
 .../staged-quote-reference.spec.ts            |  10 -
 .../staged-quote/staged-quote-reference.ts    |   7 -
 .../presets/standalone-price-reference.ts     |   6 +
 .../presets/standalone-price/index.ts         |   1 -
 .../standalone-price-reference.spec.ts        |  11 -
 .../standalone-price-reference.ts             |   7 -
 .../src/reference/presets/state-reference.ts  |   6 +
 .../src/reference/presets/state/index.ts      |   1 -
 .../presets/state/state-reference.spec.ts     |  10 -
 .../presets/state/state-reference.ts          |   6 -
 .../src/reference/presets/store-reference.ts  |   6 +
 .../src/reference/presets/store/index.ts      |   1 -
 .../presets/store/store-reference.spec.ts     |  10 -
 .../presets/store/store-reference.ts          |   6 -
 .../presets/subscription-reference.ts         |   6 +
 .../reference/presets/subscription/index.ts   |   1 -
 .../subscription-reference.spec.ts            |  10 -
 .../subscription/subscription-reference.ts    |   7 -
 .../presets/tax-category-reference.ts         |   6 +
 .../reference/presets/tax-category/index.ts   |   1 -
 .../tax-category-reference.spec.ts            |  10 -
 .../tax-category/tax-category-reference.ts    |   7 -
 .../src/reference/presets/type-reference.ts   |   6 +
 .../src/reference/presets/type/index.ts       |   1 -
 .../presets/type/type-reference.spec.ts       |  10 -
 .../reference/presets/type/type-reference.ts  |   6 -
 .../src/reference/presets/zone-reference.ts   |   6 +
 .../src/reference/presets/zone/index.ts       |   1 -
 .../presets/zone/zone-reference.spec.ts       |  10 -
 .../reference/presets/zone/zone-reference.ts  |   6 -
 .../reference/reference-draft/builder.spec.ts |  45 ----
 .../src/reference/reference-draft/builder.ts  |  13 --
 .../reference-draft/builders.spec.ts          |  94 ++++++++
 .../src/reference/reference-draft/builders.ts |  42 ++++
 .../reference-draft/fields-config.ts          |  21 ++
 .../reference/reference-draft/generator.ts    |  12 -
 .../src/reference/reference-draft/index.ts    |  26 ++-
 .../reference-draft-presets-builder.spec.ts   |  45 ++++
 .../reference-draft-presets-builder.ts        |  22 ++
 .../presets/associate-role-draft-reference.ts |   6 +
 .../associate-role-reference.spec.ts          |  11 -
 .../associate-role-reference.ts               |   7 -
 .../presets/associate-role/index.ts           |   1 -
 .../attribute-group-draft-reference.ts        |   6 +
 .../attribute-group-reference.spec.ts         |  11 -
 .../attribute-group-reference.ts              |   7 -
 .../presets/attribute-group/index.ts          |   1 -
 .../presets/business-unit-draft-reference.ts  |   6 +
 .../business-unit-reference.spec.ts           |  11 -
 .../business-unit/business-unit-reference.ts  |   7 -
 .../presets/business-unit/index.ts            |   1 -
 .../presets/cart-discount-draft-reference.ts  |   6 +
 .../cart-discount-reference.spec.ts           |  11 -
 .../cart-discount/cart-discount-reference.ts  |   7 -
 .../presets/cart-discount/index.ts            |   1 -
 .../presets/cart-draft-reference.ts           |   6 +
 .../presets/cart/cart-reference.spec.ts       |  10 -
 .../presets/cart/cart-reference.ts            |   7 -
 .../reference-draft/presets/cart/index.ts     |   1 -
 .../presets/category-draft-reference.ts       |   6 +
 .../category/category-reference.spec.ts       |  10 -
 .../presets/category/category-reference.ts    |   7 -
 .../reference-draft/presets/category/index.ts |   1 -
 .../presets/channel-draft-reference.ts        |   6 +
 .../presets/channel/channel-reference.spec.ts |  10 -
 .../presets/channel/channel-reference.ts      |   7 -
 .../reference-draft/presets/channel/index.ts  |   1 -
 .../presets/customer-draft-reference.ts       |   6 +
 .../customer-group-draft-draft-reference.ts   |   6 +
 .../customer-group-reference.spec.ts          |  11 -
 .../customer-group-reference.ts               |   7 -
 .../presets/customer-group/index.ts           |   1 -
 .../customer/customer-reference.spec.ts       |  10 -
 .../presets/customer/customer-reference.ts    |   7 -
 .../reference-draft/presets/customer/index.ts |   1 -
 .../direct-discount-draft-reference.ts        |   6 +
 .../direct-discount-reference.spec.ts         |  11 -
 .../direct-discount-reference.ts              |   7 -
 .../presets/direct-discount/index.ts          |   1 -
 .../presets/discount-code-draft-reference.ts  |   6 +
 .../discount-code-reference.spec.ts           |  11 -
 .../discount-code/discount-code-reference.ts  |   7 -
 .../presets/discount-code/index.ts            |   1 -
 .../presets/extension-draft-reference.ts      |   6 +
 .../extension/extension-reference.spec.ts     |  10 -
 .../presets/extension/extension-reference.ts  |   7 -
 .../presets/extension/index.ts                |   1 -
 .../reference-draft/presets/index.ts          | 218 ++++++++++++------
 .../inventory-entry-draft-reference.ts        |   6 +
 .../presets/inventory-entry/index.ts          |   1 -
 .../inventory-entry-reference.spec.ts         |  11 -
 .../inventory-entry-reference.ts              |   7 -
 .../key-value-document-draft-reference.ts     |   6 +
 .../presets/key-value-document/index.ts       |   1 -
 .../key-value-document-reference.spec.ts      |  11 -
 .../key-value-document-reference.ts           |   7 -
 .../presets/order-draft-reference.ts          |   6 +
 .../presets/order-edit-draft-reference.ts     |   6 +
 .../presets/order-edit/index.ts               |   1 -
 .../order-edit/order-edit-reference.spec.ts   |  10 -
 .../order-edit/order-edit-reference.ts        |   7 -
 .../reference-draft/presets/order/index.ts    |   1 -
 .../presets/order/order-reference.spec.ts     |  10 -
 .../presets/order/order-reference.ts          |   7 -
 .../presets/payment-draft-reference.ts        |   6 +
 .../reference-draft/presets/payment/index.ts  |   1 -
 .../presets/payment/payment-reference.spec.ts |  10 -
 .../presets/payment/payment-reference.ts      |   7 -
 .../product-discount-draft-reference.ts       |   6 +
 .../presets/product-discount/index.ts         |   1 -
 .../product-discount-reference.spec.ts        |  11 -
 .../product-discount-reference.ts             |   7 -
 .../presets/product-draft-reference.ts        |   6 +
 .../presets/product-price-draft-reference.ts  |   6 +
 .../presets/product-price/index.ts            |   1 -
 .../product-price-reference.spec.ts           |  11 -
 .../product-price/product-price-reference.ts  |   7 -
 .../product-selection-draft-reference.ts      |   6 +
 .../presets/product-selection/index.ts        |   1 -
 .../product-selection-reference.spec.ts       |  11 -
 .../product-selection-reference.ts            |   7 -
 .../presets/product-type-draft-reference.ts   |   6 +
 .../presets/product-type/index.ts             |   1 -
 .../product-type-reference.spec.ts            |  10 -
 .../product-type/product-type-reference.ts    |   7 -
 .../reference-draft/presets/product/index.ts  |   1 -
 .../presets/product/product-reference.spec.ts |  10 -
 .../presets/product/product-reference.ts      |   7 -
 .../presets/quote-draft-reference.ts          |   6 +
 .../presets/quote-request-draft-reference.ts  |   6 +
 .../presets/quote-request/index.ts            |   1 -
 .../quote-request/quote-request-reference.ts  |   7 -
 .../quote-request/quote-request.spec.ts       |  11 -
 .../reference-draft/presets/quote/index.ts    |   1 -
 .../presets/quote/quote-reference.spec.ts     |  10 -
 .../presets/quote/quote-reference.ts          |   7 -
 .../presets/review-draft-reference.ts         |   6 +
 .../reference-draft/presets/review/index.ts   |   1 -
 .../presets/review/review-reference.spec.ts   |  10 -
 .../presets/review/review-reference.ts        |   7 -
 .../shipping-method-draft-reference.ts        |   6 +
 .../presets/shipping-method/index.ts          |   1 -
 .../shipping-method-reference.spec.ts         |  11 -
 .../shipping-method-reference.ts              |   7 -
 .../presets/shopping-list-draft-reference.ts  |   6 +
 .../presets/shopping-list/index.ts            |   1 -
 .../shopping-list-reference.spec.ts           |  11 -
 .../shopping-list/shopping-list-reference.ts  |   7 -
 .../presets/staged-quote-draft-reference.ts   |   6 +
 .../presets/staged-quote/index.ts             |   1 -
 .../staged-quote-reference.spec.ts            |  10 -
 .../staged-quote/staged-quote-reference.ts    |   7 -
 .../standalone-price-draft-reference.ts       |   6 +
 .../presets/standalone-price/index.ts         |   1 -
 .../standalone-price-reference.spec.ts        |  11 -
 .../standalone-price-reference.ts             |   7 -
 .../presets/state-draft-reference.ts          |   6 +
 .../reference-draft/presets/state/index.ts    |   1 -
 .../presets/state/state-reference.spec.ts     |  10 -
 .../presets/state/state-reference.ts          |   7 -
 .../presets/store-draft-reference.ts          |   6 +
 .../reference-draft/presets/store/index.ts    |   1 -
 .../presets/store/store-reference.spec.ts     |  10 -
 .../presets/store/store-reference.ts          |   7 -
 .../presets/subscription-draft-reference.ts   |   6 +
 .../presets/subscription/index.ts             |   1 -
 .../subscription-reference.spec.ts            |  11 -
 .../subscription/subscription-reference.ts    |   7 -
 .../presets/tax-category-draft-reference.ts   |   6 +
 .../presets/tax-category/index.ts             |   1 -
 .../tax-category-reference.spec.ts            |  10 -
 .../tax-category/tax-category-reference.ts    |   7 -
 .../presets/type-draft-reference.ts           |   6 +
 .../reference-draft/presets/type/index.ts     |   1 -
 .../presets/type/type-reference.spec.ts       |  10 -
 .../presets/type/type-reference.ts            |   7 -
 .../presets/zone-draft-reference.ts           |   6 +
 .../reference-draft/presets/zone/index.ts     |   1 -
 .../presets/zone/zone-reference.spec.ts       |  10 -
 .../presets/zone/zone-reference.ts            |   7 -
 .../reference/reference-draft/transformers.ts |  23 --
 models/commons/src/reference/transformers.ts  |  32 ---
 models/commons/src/reference/types.ts         |  59 +++--
 .../product-draft/presets/empty.spec.ts       |   1 +
 313 files changed, 1365 insertions(+), 1643 deletions(-)
 create mode 100644 .changeset/afraid-pandas-wash.md
 create mode 100644 .changeset/nervous-weeks-march.md
 delete mode 100644 models/commons/src/reference/builder.spec.ts
 delete mode 100644 models/commons/src/reference/builder.ts
 create mode 100644 models/commons/src/reference/builders.spec.ts
 create mode 100644 models/commons/src/reference/builders.ts
 create mode 100644 models/commons/src/reference/fields-config.ts
 delete mode 100644 models/commons/src/reference/generator.ts
 create mode 100644 models/commons/src/reference/presets/_shared/reference-presets-builder.spec.ts
 create mode 100644 models/commons/src/reference/presets/_shared/reference-presets-builder.ts
 create mode 100644 models/commons/src/reference/presets/associate-role-reference.ts
 delete mode 100644 models/commons/src/reference/presets/associate-role/associate-role-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/associate-role/associate-role-reference.ts
 delete mode 100644 models/commons/src/reference/presets/associate-role/index.ts
 create mode 100644 models/commons/src/reference/presets/attribute-group-reference.ts
 delete mode 100644 models/commons/src/reference/presets/attribute-group/attribute-group-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/attribute-group/attribute-group-reference.ts
 delete mode 100644 models/commons/src/reference/presets/attribute-group/index.ts
 create mode 100644 models/commons/src/reference/presets/business-unit-reference.ts
 delete mode 100644 models/commons/src/reference/presets/business-unit/business-unit-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/business-unit/business-unit-reference.ts
 delete mode 100644 models/commons/src/reference/presets/business-unit/index.ts
 create mode 100644 models/commons/src/reference/presets/cart-discount-reference.ts
 delete mode 100644 models/commons/src/reference/presets/cart-discount/cart-discount-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/cart-discount/cart-discount-reference.ts
 delete mode 100644 models/commons/src/reference/presets/cart-discount/index.ts
 create mode 100644 models/commons/src/reference/presets/cart-reference.ts
 delete mode 100644 models/commons/src/reference/presets/cart/cart-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/cart/cart-reference.ts
 delete mode 100644 models/commons/src/reference/presets/cart/index.ts
 create mode 100644 models/commons/src/reference/presets/category-reference.ts
 delete mode 100644 models/commons/src/reference/presets/category/category-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/category/category-reference.ts
 delete mode 100644 models/commons/src/reference/presets/category/index.ts
 create mode 100644 models/commons/src/reference/presets/channel-reference.ts
 delete mode 100644 models/commons/src/reference/presets/channel/channel-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/channel/channel-reference.ts
 delete mode 100644 models/commons/src/reference/presets/channel/index.ts
 create mode 100644 models/commons/src/reference/presets/customer-group-reference.ts
 delete mode 100644 models/commons/src/reference/presets/customer-group/customer-group-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/customer-group/customer-group-reference.ts
 delete mode 100644 models/commons/src/reference/presets/customer-group/index.ts
 create mode 100644 models/commons/src/reference/presets/customer-reference.ts
 delete mode 100644 models/commons/src/reference/presets/customer/customer-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/customer/customer-reference.ts
 delete mode 100644 models/commons/src/reference/presets/customer/index.ts
 create mode 100644 models/commons/src/reference/presets/direct-discount-reference.ts
 delete mode 100644 models/commons/src/reference/presets/direct-discount/direct-discount-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/direct-discount/direct-discount-reference.ts
 delete mode 100644 models/commons/src/reference/presets/direct-discount/index.ts
 create mode 100644 models/commons/src/reference/presets/discount-code-reference.ts
 delete mode 100644 models/commons/src/reference/presets/discount-code/discount-code-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/discount-code/discount-code-reference.ts
 delete mode 100644 models/commons/src/reference/presets/discount-code/index.ts
 create mode 100644 models/commons/src/reference/presets/extension-reference.ts
 delete mode 100644 models/commons/src/reference/presets/extension/extension-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/extension/extension-reference.ts
 delete mode 100644 models/commons/src/reference/presets/extension/index.ts
 create mode 100644 models/commons/src/reference/presets/inventory-entry-reference.ts
 delete mode 100644 models/commons/src/reference/presets/inventory-entry/index.ts
 delete mode 100644 models/commons/src/reference/presets/inventory-entry/inventory-entry-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/inventory-entry/inventory-entry-reference.ts
 create mode 100644 models/commons/src/reference/presets/key-value-document-reference.ts
 delete mode 100644 models/commons/src/reference/presets/key-value-document/index.ts
 delete mode 100644 models/commons/src/reference/presets/key-value-document/key-value-document-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/key-value-document/key-value-document-reference.ts
 create mode 100644 models/commons/src/reference/presets/order-edit-reference.ts
 delete mode 100644 models/commons/src/reference/presets/order-edit/index.ts
 delete mode 100644 models/commons/src/reference/presets/order-edit/order-edit-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/order-edit/order-edit-reference.ts
 create mode 100644 models/commons/src/reference/presets/order-reference.ts
 delete mode 100644 models/commons/src/reference/presets/order/index.ts
 delete mode 100644 models/commons/src/reference/presets/order/order-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/order/order-reference.ts
 create mode 100644 models/commons/src/reference/presets/payment-reference.ts
 delete mode 100644 models/commons/src/reference/presets/payment/index.ts
 delete mode 100644 models/commons/src/reference/presets/payment/payment-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/payment/payment-reference.ts
 create mode 100644 models/commons/src/reference/presets/product-discount-reference.ts
 delete mode 100644 models/commons/src/reference/presets/product-discount/index.ts
 delete mode 100644 models/commons/src/reference/presets/product-discount/product-discount-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/product-discount/product-discount-reference.ts
 create mode 100644 models/commons/src/reference/presets/product-price-reference.ts
 delete mode 100644 models/commons/src/reference/presets/product-price/index.ts
 delete mode 100644 models/commons/src/reference/presets/product-price/product-price-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/product-price/product-price-reference.ts
 create mode 100644 models/commons/src/reference/presets/product-reference.ts
 create mode 100644 models/commons/src/reference/presets/product-selection-reference.ts
 delete mode 100644 models/commons/src/reference/presets/product-selection/index.ts
 delete mode 100644 models/commons/src/reference/presets/product-selection/product-selection-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/product-selection/product-selection-reference.ts
 create mode 100644 models/commons/src/reference/presets/product-type-reference.ts
 delete mode 100644 models/commons/src/reference/presets/product-type/index.ts
 delete mode 100644 models/commons/src/reference/presets/product-type/product-type-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/product-type/product-type-reference.ts
 delete mode 100644 models/commons/src/reference/presets/product/index.ts
 delete mode 100644 models/commons/src/reference/presets/product/product-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/product/product-reference.ts
 create mode 100644 models/commons/src/reference/presets/quote-reference.ts
 create mode 100644 models/commons/src/reference/presets/quote-request-reference.ts
 delete mode 100644 models/commons/src/reference/presets/quote-request/index.ts
 delete mode 100644 models/commons/src/reference/presets/quote-request/quote-request-reference.ts
 delete mode 100644 models/commons/src/reference/presets/quote-request/quote-request.spec.ts
 delete mode 100644 models/commons/src/reference/presets/quote/index.ts
 delete mode 100644 models/commons/src/reference/presets/quote/quote-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/quote/quote-reference.ts
 create mode 100644 models/commons/src/reference/presets/review-reference.ts
 delete mode 100644 models/commons/src/reference/presets/review/index.ts
 delete mode 100644 models/commons/src/reference/presets/review/review-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/review/review-reference.ts
 create mode 100644 models/commons/src/reference/presets/shipping-method-reference.ts
 delete mode 100644 models/commons/src/reference/presets/shipping-method/index.ts
 delete mode 100644 models/commons/src/reference/presets/shipping-method/shipping-method-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/shipping-method/shipping-method-reference.ts
 create mode 100644 models/commons/src/reference/presets/shopping-list-reference.ts
 delete mode 100644 models/commons/src/reference/presets/shopping-list/index.ts
 delete mode 100644 models/commons/src/reference/presets/shopping-list/shopping-list-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/shopping-list/shopping-list-reference.ts
 create mode 100644 models/commons/src/reference/presets/staged-quote-reference.ts
 delete mode 100644 models/commons/src/reference/presets/staged-quote/index.ts
 delete mode 100644 models/commons/src/reference/presets/staged-quote/staged-quote-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/staged-quote/staged-quote-reference.ts
 create mode 100644 models/commons/src/reference/presets/standalone-price-reference.ts
 delete mode 100644 models/commons/src/reference/presets/standalone-price/index.ts
 delete mode 100644 models/commons/src/reference/presets/standalone-price/standalone-price-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/standalone-price/standalone-price-reference.ts
 create mode 100644 models/commons/src/reference/presets/state-reference.ts
 delete mode 100644 models/commons/src/reference/presets/state/index.ts
 delete mode 100644 models/commons/src/reference/presets/state/state-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/state/state-reference.ts
 create mode 100644 models/commons/src/reference/presets/store-reference.ts
 delete mode 100644 models/commons/src/reference/presets/store/index.ts
 delete mode 100644 models/commons/src/reference/presets/store/store-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/store/store-reference.ts
 create mode 100644 models/commons/src/reference/presets/subscription-reference.ts
 delete mode 100644 models/commons/src/reference/presets/subscription/index.ts
 delete mode 100644 models/commons/src/reference/presets/subscription/subscription-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/subscription/subscription-reference.ts
 create mode 100644 models/commons/src/reference/presets/tax-category-reference.ts
 delete mode 100644 models/commons/src/reference/presets/tax-category/index.ts
 delete mode 100644 models/commons/src/reference/presets/tax-category/tax-category-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/tax-category/tax-category-reference.ts
 create mode 100644 models/commons/src/reference/presets/type-reference.ts
 delete mode 100644 models/commons/src/reference/presets/type/index.ts
 delete mode 100644 models/commons/src/reference/presets/type/type-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/type/type-reference.ts
 create mode 100644 models/commons/src/reference/presets/zone-reference.ts
 delete mode 100644 models/commons/src/reference/presets/zone/index.ts
 delete mode 100644 models/commons/src/reference/presets/zone/zone-reference.spec.ts
 delete mode 100644 models/commons/src/reference/presets/zone/zone-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/builder.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/builder.ts
 create mode 100644 models/commons/src/reference/reference-draft/builders.spec.ts
 create mode 100644 models/commons/src/reference/reference-draft/builders.ts
 create mode 100644 models/commons/src/reference/reference-draft/fields-config.ts
 delete mode 100644 models/commons/src/reference/reference-draft/generator.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/_shared/reference-draft-presets-builder.spec.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/_shared/reference-draft-presets-builder.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/associate-role-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/associate-role/associate-role-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/associate-role/associate-role-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/associate-role/index.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/attribute-group-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/attribute-group/attribute-group-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/attribute-group/attribute-group-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/attribute-group/index.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/business-unit-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/business-unit/business-unit-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/business-unit/business-unit-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/business-unit/index.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/cart-discount-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/cart-discount/cart-discount-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/cart-discount/cart-discount-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/cart-discount/index.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/cart-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/cart/cart-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/cart/cart-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/cart/index.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/category-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/category/category-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/category/category-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/category/index.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/channel-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/channel/channel-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/channel/channel-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/channel/index.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/customer-draft-reference.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/customer-group-draft-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/customer-group/customer-group-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/customer-group/customer-group-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/customer-group/index.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/customer/customer-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/customer/customer-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/customer/index.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/direct-discount-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/direct-discount/direct-discount-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/direct-discount/direct-discount-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/direct-discount/index.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/discount-code-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/discount-code/discount-code-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/discount-code/discount-code-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/discount-code/index.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/extension-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/extension/extension-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/extension/extension-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/extension/index.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/inventory-entry-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/inventory-entry/index.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/inventory-entry/inventory-entry-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/inventory-entry/inventory-entry-reference.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/key-value-document-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/key-value-document/index.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/key-value-document/key-value-document-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/key-value-document/key-value-document-reference.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/order-draft-reference.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/order-edit-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/order-edit/index.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/order-edit/order-edit-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/order-edit/order-edit-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/order/index.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/order/order-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/order/order-reference.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/payment-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/payment/index.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/payment/payment-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/payment/payment-reference.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/product-discount-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/product-discount/index.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/product-discount/product-discount-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/product-discount/product-discount-reference.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/product-draft-reference.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/product-price-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/product-price/index.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/product-price/product-price-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/product-price/product-price-reference.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/product-selection-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/product-selection/index.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/product-selection/product-selection-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/product-selection/product-selection-reference.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/product-type-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/product-type/index.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/product-type/product-type-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/product-type/product-type-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/product/index.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/product/product-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/product/product-reference.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/quote-draft-reference.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/quote-request-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/quote-request/index.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/quote-request/quote-request-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/quote-request/quote-request.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/quote/index.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/quote/quote-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/quote/quote-reference.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/review-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/review/index.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/review/review-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/review/review-reference.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/shipping-method-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/shipping-method/index.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/shipping-method/shipping-method-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/shipping-method/shipping-method-reference.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/shopping-list-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/shopping-list/index.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/shopping-list/shopping-list-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/shopping-list/shopping-list-reference.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/staged-quote-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/staged-quote/index.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/staged-quote/staged-quote-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/staged-quote/staged-quote-reference.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/standalone-price-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/standalone-price/index.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/standalone-price/standalone-price-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/standalone-price/standalone-price-reference.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/state-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/state/index.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/state/state-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/state/state-reference.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/store-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/store/index.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/store/store-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/store/store-reference.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/subscription-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/subscription/index.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/subscription/subscription-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/subscription/subscription-reference.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/tax-category-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/tax-category/index.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/tax-category/tax-category-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/tax-category/tax-category-reference.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/type-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/type/index.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/type/type-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/type/type-reference.ts
 create mode 100644 models/commons/src/reference/reference-draft/presets/zone-draft-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/zone/index.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/zone/zone-reference.spec.ts
 delete mode 100644 models/commons/src/reference/reference-draft/presets/zone/zone-reference.ts
 delete mode 100644 models/commons/src/reference/reference-draft/transformers.ts
 delete mode 100644 models/commons/src/reference/transformers.ts

diff --git a/.changeset/afraid-pandas-wash.md b/.changeset/afraid-pandas-wash.md
new file mode 100644
index 000000000..8b56ca6cd
--- /dev/null
+++ b/.changeset/afraid-pandas-wash.md
@@ -0,0 +1,41 @@
+---
+'@commercetools-test-data/commons': patch
+---
+
+Migrated the `Reference` model to the new implementation patterns.
+
+Now REST and GraphQL model instances can be created using their own builders:
+
+```ts
+import {
+  ReferenceRest,
+  ReferenceGraphql,
+  ReferenceDraftRest,
+  ReferenceDraftGraphql,
+} from '@commercetools-test-data/commons';
+
+// Query models
+const restProductRef = ReferenceRest.random().
+  .typeId('product')
+  .build();
+const graphqlProductRef = ReferenceGraphql.random().
+  .typeId('product')
+  .build();
+
+// Draft models
+const restProductRefDraft = ReferenceDraftRest.random().
+  .typeId('product')
+  .build();
+const graphqlProductRefDraft = ReferenceDraftGraphql.random().
+  .typeId('product')
+  .build();
+
+
+// Presets
+const restCategoryRef = ReferenceRest.presets
+  .category()
+  .build();
+const graphqlCategoryRefDraft = ReferenceDraftGraphql.presets
+  .category()
+  .build();
+```
diff --git a/.changeset/nervous-weeks-march.md b/.changeset/nervous-weeks-march.md
new file mode 100644
index 000000000..b8a2b64aa
--- /dev/null
+++ b/.changeset/nervous-weeks-march.md
@@ -0,0 +1,5 @@
+---
+'@commercetools-test-data/product': patch
+---
+
+Fix test assertion.
diff --git a/models/commons/README.md b/models/commons/README.md
index 03cd7f175..9c72e0352 100644
--- a/models/commons/README.md
+++ b/models/commons/README.md
@@ -187,25 +187,45 @@ const priceDraft = PriceDraft.random().build<TPriceDraft>();
 ```ts
 import {
   Reference,
+  ReferenceRest,
+  ReferenceGraphql,
   ReferenceDraft,
+  ReferenceDraftRest,
+  ReferenceDraftGraphql,
   type TReference,
   type TReferenceDraft,
 } from '@commercetools-test-data/commons';
 
+// DEPRECATED. Please use one of the methods below
 const productRef = Reference.random()
   .typeId('product')
   .build<TReference<'product'>>();
+const restProductRef = ReferenceRest.random().
+  .typeId('product')
+  .build();
+const graphqlProductRef = ReferenceGraphql.random().
+  .typeId('product')
+  .build();
+
+// DEPRECATED. Please use one of the methods below
 const productRefDraft = ReferenceDraft.random()
   .typeId('product')
   .build<TReferenceDraft<'product'>>();
+const restProductRefDraft = ReferenceDraftRest.random().
+  .typeId('product')
+  .build();
+const graphqlProductRefDraft = ReferenceDraftGraphql.random().
+  .typeId('product')
+  .build();
+
 
 // Presets
-const categoryRef = Reference.presets
+const restCategoryRef = ReferenceRest.presets
   .category()
-  .build<TReference<'category'>>();
-const categoryRefDraft = ReferenceDraft.presets
+  .build();
+const graphqlCategoryRefDraft = ReferenceDraftGraphql.presets
   .category()
-  .build<TReferenceDraft<'category'>>();
+  .build();
 ```
 
 ## `PriceTier`
diff --git a/models/commons/src/client-logging/generator.ts b/models/commons/src/client-logging/generator.ts
index a903e6a96..83a7ebf2a 100644
--- a/models/commons/src/client-logging/generator.ts
+++ b/models/commons/src/client-logging/generator.ts
@@ -1,5 +1,5 @@
 import { Generator, fake } from '@commercetools-test-data/core';
-import * as Reference from '../reference';
+import { Reference } from '../reference';
 import type { TClientLogging } from './types';
 
 // https://docs.commercetools.com/api/types#client-logging
diff --git a/models/commons/src/client-logging/transformers.ts b/models/commons/src/client-logging/transformers.ts
index b9eacf090..84bee0cd6 100644
--- a/models/commons/src/client-logging/transformers.ts
+++ b/models/commons/src/client-logging/transformers.ts
@@ -1,6 +1,6 @@
 import { buildField, Transformer } from '@commercetools-test-data/core';
 import { faker } from '@faker-js/faker';
-import * as Reference from '../reference';
+import { Reference } from '../reference';
 import { TReference } from '../reference/types';
 import type { TClientLogging, TClientLoggingGraphql } from './types';
 
diff --git a/models/commons/src/discounted-price/discounted-price-draft/fields-config.ts b/models/commons/src/discounted-price/discounted-price-draft/fields-config.ts
index 881e6dfa9..692fc0033 100644
--- a/models/commons/src/discounted-price/discounted-price-draft/fields-config.ts
+++ b/models/commons/src/discounted-price/discounted-price-draft/fields-config.ts
@@ -1,6 +1,6 @@
 import { fake, TModelFieldsConfig } from '@commercetools-test-data/core';
 import * as Money from '../../money';
-import * as Reference from '../../reference';
+import { Reference } from '../../reference';
 import type {
   TDiscountedPriceDraftRest,
   TDiscountedPriceDraftGraphql,
diff --git a/models/commons/src/discounted-price/fields-config.ts b/models/commons/src/discounted-price/fields-config.ts
index 421a02e43..30c44e909 100644
--- a/models/commons/src/discounted-price/fields-config.ts
+++ b/models/commons/src/discounted-price/fields-config.ts
@@ -1,7 +1,7 @@
 import { fake, TModelFieldsConfig } from '@commercetools-test-data/core';
 import { ProductDiscount } from '@commercetools-test-data/product-discount';
 import * as Money from '../money';
-import * as Reference from '../reference';
+import { Reference } from '../reference';
 import type { TDiscountedPriceGraphql, TDiscountedPriceRest } from './types';
 
 // https://docs.commercetools.com/api/types#discountedprice
diff --git a/models/commons/src/index.ts b/models/commons/src/index.ts
index 10f50a694..3b6771f64 100644
--- a/models/commons/src/index.ts
+++ b/models/commons/src/index.ts
@@ -31,11 +31,10 @@ export * as Money from './money';
 export * as MoneyDraft from './money/money-draft';
 export * as Price from './price';
 export * as PriceDraft from './price/price-draft';
-export * as Reference from './reference';
-export * as ReferenceDraft from './reference/reference-draft';
 export * as PriceTier from './price-tier';
 export * as PriceTierDraft from './price-tier/price-tier-draft';
 
 export * from './discounted-line-item-portion';
 export * from './discounted-line-item-price';
 export * from './geometry';
+export * from './reference';
diff --git a/models/commons/src/reference/builder.spec.ts b/models/commons/src/reference/builder.spec.ts
deleted file mode 100644
index ef4c9a6c1..000000000
--- a/models/commons/src/reference/builder.spec.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/* eslint-disable jest/no-disabled-tests */
-/* eslint-disable jest/valid-title */
-import { createBuilderSpec } from '@commercetools-test-data/core/test-utils';
-import type { TReference, TReferenceGraphql, TReferenceRest } from './types';
-import * as Reference from './index';
-
-describe('builder', () => {
-  it(
-    ...createBuilderSpec<TReference, TReference>(
-      'default',
-      Reference.random(),
-      {
-        id: expect.any(String),
-        typeId: null,
-      }
-    )
-  );
-  it(
-    ...createBuilderSpec<TReference, TReferenceRest>(
-      'rest',
-      Reference.random().typeId('product'),
-      {
-        id: expect.any(String),
-        typeId: 'product',
-        obj: {
-          id: expect.any(String),
-        },
-      }
-    )
-  );
-  it(
-    ...createBuilderSpec<TReference, TReferenceGraphql>(
-      'graphql',
-      Reference.random().typeId('product'),
-      {
-        __typename: 'Reference',
-        id: expect.any(String),
-        typeId: 'product',
-      }
-    )
-  );
-});
diff --git a/models/commons/src/reference/builder.ts b/models/commons/src/reference/builder.ts
deleted file mode 100644
index 3ba7bb4f3..000000000
--- a/models/commons/src/reference/builder.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Builder } from '@commercetools-test-data/core';
-import generator from './generator';
-import transformers from './transformers';
-import type { TCreateReferenceBuilder, TReference } from './types';
-
-const Model: TCreateReferenceBuilder = () =>
-  Builder<TReference>({
-    name: 'Reference',
-    generator,
-    transformers,
-  });
-
-export default Model;
diff --git a/models/commons/src/reference/builders.spec.ts b/models/commons/src/reference/builders.spec.ts
new file mode 100644
index 000000000..927e79cae
--- /dev/null
+++ b/models/commons/src/reference/builders.spec.ts
@@ -0,0 +1,122 @@
+import {
+  createSpecializedBuilder,
+  fake,
+  TBuilder,
+  TModelFieldsConfig,
+} from '@commercetools-test-data/core';
+import type { TReferenceGraphql, TReferenceRest } from './types';
+import { Reference, ReferenceGraphql, ReferenceRest } from './index';
+
+// Simple model for testing purposes
+type TTestModelRest = {
+  id: string;
+  value: string;
+  version?: number;
+};
+const RestTestModelBuilder: () => TBuilder<TTestModelRest> = () =>
+  createSpecializedBuilder({
+    name: 'ChannelRestBuilder',
+    type: 'rest',
+    modelFieldsConfig: {
+      fields: {
+        id: fake((f) => f.string.uuid()),
+        value: fake((f) => f.lorem.words()),
+        version: fake((f) => f.number.int()),
+      },
+    } as TModelFieldsConfig<TTestModelRest>,
+  });
+
+const validateRestModel = (
+  restModel: TReferenceRest,
+  typeId: string | null = null
+) => {
+  expect(restModel).toEqual(
+    expect.objectContaining({
+      id: expect.any(String),
+      typeId,
+      obj: expect.objectContaining({
+        id: expect.any(String),
+      }),
+    })
+  );
+};
+
+const validateGraphqlModel = (graphqlModel: TReferenceGraphql) => {
+  expect(graphqlModel).toEqual(
+    expect.objectContaining({
+      id: expect.any(String),
+      typeId: null,
+      __typename: 'Reference',
+    })
+  );
+};
+
+describe('Channel model builders', () => {
+  it('builds a REST model', () => {
+    const restModel = ReferenceRest.random().build();
+
+    validateRestModel(restModel);
+  });
+
+  it('builds a populated REST model', () => {
+    const restModel = ReferenceRest.random()
+      .id('12345')
+      .typeId('foo')
+      .obj(RestTestModelBuilder())
+      .build<TReferenceRest<'foo', TTestModelRest>>();
+
+    validateRestModel(restModel, 'foo');
+    expect(restModel.obj?.value).toEqual(expect.any(String));
+  });
+
+  it('builds a GraphQL model', () => {
+    const graphqlModel = ReferenceGraphql.random().build();
+
+    validateGraphqlModel(graphqlModel);
+  });
+
+  it('builds a populated GraphQL model', () => {
+    const graphqlModel = ReferenceGraphql.random()
+      .id('12345')
+      .typeId('foo')
+      .build();
+
+    expect(graphqlModel.id).toEqual('12345');
+    expect(graphqlModel.typeId).toEqual('foo');
+  });
+});
+
+describe('Channel model compatibility builders', () => {
+  it('builds a REST model', () => {
+    const restModel = Reference.random().buildRest();
+
+    validateRestModel(restModel);
+  });
+
+  it('builds a populated REST model', () => {
+    const restModel = Reference.random()
+      .id('12345')
+      .typeId('foo')
+      .obj(RestTestModelBuilder())
+      .buildRest<TReferenceRest<'foo', TTestModelRest>>();
+
+    validateRestModel(restModel, 'foo');
+    expect(restModel.obj?.value).toEqual(expect.any(String));
+  });
+
+  it('builds a GraphQL model', () => {
+    const graphqlModel = Reference.random().buildGraphql();
+
+    validateGraphqlModel(graphqlModel);
+  });
+
+  it('builds a populated GraphQL model', () => {
+    const graphqlModel = Reference.random()
+      .id('12345')
+      .typeId('foo')
+      .buildGraphql();
+
+    expect(graphqlModel.id).toEqual('12345');
+    expect(graphqlModel.typeId).toEqual('foo');
+  });
+});
diff --git a/models/commons/src/reference/builders.ts b/models/commons/src/reference/builders.ts
new file mode 100644
index 000000000..05cb94a8a
--- /dev/null
+++ b/models/commons/src/reference/builders.ts
@@ -0,0 +1,38 @@
+import {
+  createCompatibilityBuilder,
+  createSpecializedBuilder,
+  TModelFieldsConfig,
+} from '@commercetools-test-data/core';
+import { restFieldsConfig, graphqlFieldsConfig } from './fields-config';
+import type {
+  TReferenceRest,
+  TReferenceGraphql,
+  TCreateReferenceBuilder,
+} from './types';
+
+export const RestModelBuilder: TCreateReferenceBuilder<TReferenceRest> = () =>
+  createSpecializedBuilder({
+    name: 'ReferenceRestBuilder',
+    type: 'rest',
+    modelFieldsConfig: restFieldsConfig,
+  });
+
+export const GraphqlModelBuilder: TCreateReferenceBuilder<
+  TReferenceGraphql
+> = () =>
+  createSpecializedBuilder({
+    name: 'ReferenceGraphqlBuilder',
+    type: 'graphql',
+    modelFieldsConfig: graphqlFieldsConfig,
+  });
+
+export const CompatModelBuilder = <
+  TReferenceModel extends TReferenceRest | TReferenceGraphql = TReferenceRest,
+>() =>
+  createCompatibilityBuilder<TReferenceModel>({
+    name: 'ReferenceCompatBuilder',
+    modelFieldsConfig: {
+      rest: restFieldsConfig as TModelFieldsConfig<TReferenceModel>,
+      graphql: graphqlFieldsConfig as TModelFieldsConfig<TReferenceModel>,
+    },
+  });
diff --git a/models/commons/src/reference/constants.ts b/models/commons/src/reference/constants.ts
index 759432edf..59888fe66 100644
--- a/models/commons/src/reference/constants.ts
+++ b/models/commons/src/reference/constants.ts
@@ -1,4 +1,7 @@
 export const referenceTypes = {
+  associateRole: 'associate-role',
+  attributeGroup: 'attribute-group',
+  businessUnit: 'business-unit',
   cart: 'cart',
   cartDiscount: 'cart-discount',
   category: 'category',
@@ -6,6 +9,8 @@ export const referenceTypes = {
   customer: 'customer',
   customerGroup: 'customer-group',
   discountCode: 'discount-code',
+  extension: 'extension',
+  inventoryEntry: 'inventory-entry',
   keyValueDocument: 'key-value-document',
   payment: 'payment',
   product: 'product',
@@ -14,10 +19,13 @@ export const referenceTypes = {
   productType: 'product-type',
   order: 'order',
   orderEdit: 'order-edit',
+  review: 'review',
   shippingMethod: 'shipping-method',
   shoppingList: 'shopping-list',
+  standalonePrice: 'standalone-price',
   state: 'state',
   store: 'store',
+  subscription: 'subscription',
   taxCategory: 'tax-category',
   type: 'type',
   zone: 'zone',
diff --git a/models/commons/src/reference/fields-config.ts b/models/commons/src/reference/fields-config.ts
new file mode 100644
index 000000000..32a28364e
--- /dev/null
+++ b/models/commons/src/reference/fields-config.ts
@@ -0,0 +1,29 @@
+import { type TModelFieldsConfig, fake } from '@commercetools-test-data/core';
+import type { TReferenceGraphql, TReferenceRest } from './types';
+
+const commonFieldsConfig = {
+  fields: {
+    id: fake((f) => f.string.uuid()),
+    typeId: null,
+  },
+};
+
+export const restFieldsConfig: TModelFieldsConfig<TReferenceRest> = {
+  fields: {
+    ...commonFieldsConfig.fields,
+    obj: null,
+  },
+  postBuild(model) {
+    return {
+      ...model,
+      obj: model.obj || { id: model.id },
+    };
+  },
+};
+
+export const graphqlFieldsConfig: TModelFieldsConfig<TReferenceGraphql> = {
+  fields: {
+    ...commonFieldsConfig.fields,
+    __typename: 'Reference',
+  },
+};
diff --git a/models/commons/src/reference/generator.ts b/models/commons/src/reference/generator.ts
deleted file mode 100644
index bcbe91c1f..000000000
--- a/models/commons/src/reference/generator.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Generator, fake } from '@commercetools-test-data/core';
-import type { TReference } from './types';
-
-// https://docs.commercetools.com/api/types#referencetype
-const generator = Generator<TReference>({
-  fields: {
-    id: fake((f) => f.string.uuid()),
-    typeId: null,
-  },
-});
-
-export default generator;
diff --git a/models/commons/src/reference/index.ts b/models/commons/src/reference/index.ts
index 138e124b7..b10712286 100644
--- a/models/commons/src/reference/index.ts
+++ b/models/commons/src/reference/index.ts
@@ -1,5 +1,30 @@
-export * as ReferenceDraft from './reference-draft';
+import {
+  RestModelBuilder,
+  GraphqlModelBuilder,
+  CompatModelBuilder,
+} from './builders';
+import * as constants from './constants';
+import * as modelPresets from './presets';
+
+export * from './reference-draft';
+
 export * as constants from './constants';
 
-export { default as random } from './builder';
-export { default as presets } from './presets';
+export const ReferenceRest = {
+  random: RestModelBuilder,
+  presets: modelPresets.restPresets,
+};
+
+export const ReferenceGraphql = {
+  random: GraphqlModelBuilder,
+  presets: modelPresets.graphqlPresets,
+};
+
+/**
+ * @deprecated Use `ReferenceRest` or `ReferenceGraphql` exported models instead of `Reference`.
+ */
+export const Reference = {
+  random: CompatModelBuilder,
+  presets: modelPresets.compatPresets,
+  constants,
+};
diff --git a/models/commons/src/reference/presets/_shared/reference-presets-builder.spec.ts b/models/commons/src/reference/presets/_shared/reference-presets-builder.spec.ts
new file mode 100644
index 000000000..3d96d6b66
--- /dev/null
+++ b/models/commons/src/reference/presets/_shared/reference-presets-builder.spec.ts
@@ -0,0 +1,50 @@
+import { buildReferencePresets } from './reference-presets-builder';
+
+const presets = buildReferencePresets('associate-role');
+
+describe('AssociateRoleReference preset', () => {
+  it('should build a REST model', () => {
+    const restModel = presets.restPreset().build();
+    expect(restModel).toEqual({
+      id: expect.any(String),
+      typeId: 'associate-role',
+      obj: expect.objectContaining({ id: expect.any(String) }),
+    });
+  });
+
+  it('should build a GraphQL model', () => {
+    const graphqlModel = presets.graphqlPreset().build();
+    expect(graphqlModel).toEqual({
+      id: expect.any(String),
+      typeId: 'associate-role',
+      __typename: 'Reference',
+    });
+  });
+
+  it('should build a compatibility model', () => {
+    const compatModel = presets.compatPreset().build();
+    expect(compatModel).toEqual({
+      id: expect.any(String),
+      typeId: 'associate-role',
+      obj: expect.objectContaining({ id: expect.any(String) }),
+    });
+  });
+
+  it('should build a compatibility REST model', () => {
+    const compatModel = presets.compatPreset().buildRest();
+    expect(compatModel).toEqual({
+      id: expect.any(String),
+      typeId: 'associate-role',
+      obj: expect.objectContaining({ id: expect.any(String) }),
+    });
+  });
+
+  it('should build a compatibility GraphQL model', () => {
+    const compatModel = presets.compatPreset().buildGraphql();
+    expect(compatModel).toEqual({
+      id: expect.any(String),
+      typeId: 'associate-role',
+      __typename: 'Reference',
+    });
+  });
+});
diff --git a/models/commons/src/reference/presets/_shared/reference-presets-builder.ts b/models/commons/src/reference/presets/_shared/reference-presets-builder.ts
new file mode 100644
index 000000000..414a4e6a4
--- /dev/null
+++ b/models/commons/src/reference/presets/_shared/reference-presets-builder.ts
@@ -0,0 +1,13 @@
+import { TBuilder } from '@commercetools-test-data/core';
+import { Reference, ReferenceGraphql, ReferenceRest } from '../..';
+import { TReference, TReferenceGraphql, TReferenceRest } from '../../types';
+
+export function buildReferencePresets(typeId: string) {
+  return {
+    restPreset: (): TBuilder<TReferenceRest> =>
+      ReferenceRest.random().typeId(typeId),
+    graphqlPreset: (): TBuilder<TReferenceGraphql> =>
+      ReferenceGraphql.random().typeId(typeId),
+    compatPreset: (): TBuilder<TReference> => Reference.random().typeId(typeId),
+  };
+}
diff --git a/models/commons/src/reference/presets/associate-role-reference.ts b/models/commons/src/reference/presets/associate-role-reference.ts
new file mode 100644
index 000000000..3e9653649
--- /dev/null
+++ b/models/commons/src/reference/presets/associate-role-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.associateRole);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/associate-role/associate-role-reference.spec.ts b/models/commons/src/reference/presets/associate-role/associate-role-reference.spec.ts
deleted file mode 100644
index 0e3afbfbd..000000000
--- a/models/commons/src/reference/presets/associate-role/associate-role-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReference } from '../../types';
-import associateRoleReference from './associate-role-reference';
-
-it('should build an associate-role reference', () => {
-  const built = associateRoleReference().build<TReference<'associate-role'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'associate-role',
-  });
-});
diff --git a/models/commons/src/reference/presets/associate-role/associate-role-reference.ts b/models/commons/src/reference/presets/associate-role/associate-role-reference.ts
deleted file mode 100644
index 0dd2228bf..000000000
--- a/models/commons/src/reference/presets/associate-role/associate-role-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const associateRoleReference = (): TReferenceBuilder =>
-  Reference().typeId('associate-role');
-
-export default associateRoleReference;
diff --git a/models/commons/src/reference/presets/associate-role/index.ts b/models/commons/src/reference/presets/associate-role/index.ts
deleted file mode 100644
index 97e12dfcc..000000000
--- a/models/commons/src/reference/presets/associate-role/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './associate-role-reference';
diff --git a/models/commons/src/reference/presets/attribute-group-reference.ts b/models/commons/src/reference/presets/attribute-group-reference.ts
new file mode 100644
index 000000000..798e58688
--- /dev/null
+++ b/models/commons/src/reference/presets/attribute-group-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.attributeGroup);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/attribute-group/attribute-group-reference.spec.ts b/models/commons/src/reference/presets/attribute-group/attribute-group-reference.spec.ts
deleted file mode 100644
index 7aa4bef3d..000000000
--- a/models/commons/src/reference/presets/attribute-group/attribute-group-reference.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { TReference } from '../../types';
-import attributeGroupReference from './attribute-group-reference';
-
-it('should build an attribute-group reference', () => {
-  const built =
-    attributeGroupReference().build<TReference<'attribute-group'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'attribute-group',
-  });
-});
diff --git a/models/commons/src/reference/presets/attribute-group/attribute-group-reference.ts b/models/commons/src/reference/presets/attribute-group/attribute-group-reference.ts
deleted file mode 100644
index 88f7041a6..000000000
--- a/models/commons/src/reference/presets/attribute-group/attribute-group-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const attributeGroupReference = (): TReferenceBuilder =>
-  Reference().typeId('attribute-group');
-
-export default attributeGroupReference;
diff --git a/models/commons/src/reference/presets/attribute-group/index.ts b/models/commons/src/reference/presets/attribute-group/index.ts
deleted file mode 100644
index 61f6304e7..000000000
--- a/models/commons/src/reference/presets/attribute-group/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './attribute-group-reference';
diff --git a/models/commons/src/reference/presets/business-unit-reference.ts b/models/commons/src/reference/presets/business-unit-reference.ts
new file mode 100644
index 000000000..5d9d5de8e
--- /dev/null
+++ b/models/commons/src/reference/presets/business-unit-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.businessUnit);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/business-unit/business-unit-reference.spec.ts b/models/commons/src/reference/presets/business-unit/business-unit-reference.spec.ts
deleted file mode 100644
index 116480021..000000000
--- a/models/commons/src/reference/presets/business-unit/business-unit-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReference } from '../../types';
-import businessUnitReference from './business-unit-reference';
-
-it('should build an business-unit reference', () => {
-  const built = businessUnitReference().build<TReference<'business-unit'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'business-unit',
-  });
-});
diff --git a/models/commons/src/reference/presets/business-unit/business-unit-reference.ts b/models/commons/src/reference/presets/business-unit/business-unit-reference.ts
deleted file mode 100644
index c27361b21..000000000
--- a/models/commons/src/reference/presets/business-unit/business-unit-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const businessUnitReference = (): TReferenceBuilder =>
-  Reference().typeId('business-unit');
-
-export default businessUnitReference;
diff --git a/models/commons/src/reference/presets/business-unit/index.ts b/models/commons/src/reference/presets/business-unit/index.ts
deleted file mode 100644
index ec2057b3e..000000000
--- a/models/commons/src/reference/presets/business-unit/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './business-unit-reference';
diff --git a/models/commons/src/reference/presets/cart-discount-reference.ts b/models/commons/src/reference/presets/cart-discount-reference.ts
new file mode 100644
index 000000000..a44cf4f36
--- /dev/null
+++ b/models/commons/src/reference/presets/cart-discount-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.cartDiscount);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/cart-discount/cart-discount-reference.spec.ts b/models/commons/src/reference/presets/cart-discount/cart-discount-reference.spec.ts
deleted file mode 100644
index 845b602ba..000000000
--- a/models/commons/src/reference/presets/cart-discount/cart-discount-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReference } from '../../types';
-import cartDiscountReference from './cart-discount-reference';
-
-it('should build a cart-discount reference', () => {
-  const built = cartDiscountReference().build<TReference<'cart-discount'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'cart-discount',
-  });
-});
diff --git a/models/commons/src/reference/presets/cart-discount/cart-discount-reference.ts b/models/commons/src/reference/presets/cart-discount/cart-discount-reference.ts
deleted file mode 100644
index 802cfbd16..000000000
--- a/models/commons/src/reference/presets/cart-discount/cart-discount-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const cartDiscountReference = (): TReferenceBuilder =>
-  Reference().typeId('cart-discount');
-
-export default cartDiscountReference;
diff --git a/models/commons/src/reference/presets/cart-discount/index.ts b/models/commons/src/reference/presets/cart-discount/index.ts
deleted file mode 100644
index b00da4f62..000000000
--- a/models/commons/src/reference/presets/cart-discount/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './cart-discount-reference';
diff --git a/models/commons/src/reference/presets/cart-reference.ts b/models/commons/src/reference/presets/cart-reference.ts
new file mode 100644
index 000000000..0533b8c81
--- /dev/null
+++ b/models/commons/src/reference/presets/cart-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.cart);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/cart/cart-reference.spec.ts b/models/commons/src/reference/presets/cart/cart-reference.spec.ts
deleted file mode 100644
index 7405bf473..000000000
--- a/models/commons/src/reference/presets/cart/cart-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReference } from '../../types';
-import cartReference from './cart-reference';
-
-it('should build a cart reference', () => {
-  const built = cartReference().build<TReference<'cart'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'cart',
-  });
-});
diff --git a/models/commons/src/reference/presets/cart/cart-reference.ts b/models/commons/src/reference/presets/cart/cart-reference.ts
deleted file mode 100644
index 8de31daf9..000000000
--- a/models/commons/src/reference/presets/cart/cart-reference.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const cartReference = (): TReferenceBuilder => Reference().typeId('cart');
-
-export default cartReference;
diff --git a/models/commons/src/reference/presets/cart/index.ts b/models/commons/src/reference/presets/cart/index.ts
deleted file mode 100644
index 33c82f8fd..000000000
--- a/models/commons/src/reference/presets/cart/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './cart-reference';
diff --git a/models/commons/src/reference/presets/category-reference.ts b/models/commons/src/reference/presets/category-reference.ts
new file mode 100644
index 000000000..68dd0c75e
--- /dev/null
+++ b/models/commons/src/reference/presets/category-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.category);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/category/category-reference.spec.ts b/models/commons/src/reference/presets/category/category-reference.spec.ts
deleted file mode 100644
index 573002bb5..000000000
--- a/models/commons/src/reference/presets/category/category-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReference } from '../../types';
-import categoryReference from './category-reference';
-
-it('should build a category reference', () => {
-  const built = categoryReference().build<TReference<'category'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'category',
-  });
-});
diff --git a/models/commons/src/reference/presets/category/category-reference.ts b/models/commons/src/reference/presets/category/category-reference.ts
deleted file mode 100644
index f52d3987d..000000000
--- a/models/commons/src/reference/presets/category/category-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const categoryReference = (): TReferenceBuilder =>
-  Reference().typeId('category');
-
-export default categoryReference;
diff --git a/models/commons/src/reference/presets/category/index.ts b/models/commons/src/reference/presets/category/index.ts
deleted file mode 100644
index ee3689866..000000000
--- a/models/commons/src/reference/presets/category/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './category-reference';
diff --git a/models/commons/src/reference/presets/channel-reference.ts b/models/commons/src/reference/presets/channel-reference.ts
new file mode 100644
index 000000000..7eb4383db
--- /dev/null
+++ b/models/commons/src/reference/presets/channel-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.channel);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/channel/channel-reference.spec.ts b/models/commons/src/reference/presets/channel/channel-reference.spec.ts
deleted file mode 100644
index c9f8820de..000000000
--- a/models/commons/src/reference/presets/channel/channel-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReference } from '../../types';
-import channelReference from './channel-reference';
-
-it('should build a channel reference', () => {
-  const built = channelReference().build<TReference<'channel'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'channel',
-  });
-});
diff --git a/models/commons/src/reference/presets/channel/channel-reference.ts b/models/commons/src/reference/presets/channel/channel-reference.ts
deleted file mode 100644
index 4a1bf219d..000000000
--- a/models/commons/src/reference/presets/channel/channel-reference.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const channelReference = (): TReferenceBuilder => Reference().typeId('channel');
-
-export default channelReference;
diff --git a/models/commons/src/reference/presets/channel/index.ts b/models/commons/src/reference/presets/channel/index.ts
deleted file mode 100644
index cf4c1fcfa..000000000
--- a/models/commons/src/reference/presets/channel/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './channel-reference';
diff --git a/models/commons/src/reference/presets/customer-group-reference.ts b/models/commons/src/reference/presets/customer-group-reference.ts
new file mode 100644
index 000000000..d45d62e94
--- /dev/null
+++ b/models/commons/src/reference/presets/customer-group-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.customerGroup);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/customer-group/customer-group-reference.spec.ts b/models/commons/src/reference/presets/customer-group/customer-group-reference.spec.ts
deleted file mode 100644
index 5069be156..000000000
--- a/models/commons/src/reference/presets/customer-group/customer-group-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReference } from '../../types';
-import customerGroupReference from './customer-group-reference';
-
-it('should build a customer-group reference', () => {
-  const built = customerGroupReference().build<TReference<'customer-group'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'customer-group',
-  });
-});
diff --git a/models/commons/src/reference/presets/customer-group/customer-group-reference.ts b/models/commons/src/reference/presets/customer-group/customer-group-reference.ts
deleted file mode 100644
index 4a29c57a7..000000000
--- a/models/commons/src/reference/presets/customer-group/customer-group-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const customerGroupReference = (): TReferenceBuilder =>
-  Reference().typeId('customer-group');
-
-export default customerGroupReference;
diff --git a/models/commons/src/reference/presets/customer-group/index.ts b/models/commons/src/reference/presets/customer-group/index.ts
deleted file mode 100644
index 5af188510..000000000
--- a/models/commons/src/reference/presets/customer-group/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './customer-group-reference';
diff --git a/models/commons/src/reference/presets/customer-reference.ts b/models/commons/src/reference/presets/customer-reference.ts
new file mode 100644
index 000000000..f55ab0e60
--- /dev/null
+++ b/models/commons/src/reference/presets/customer-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.customer);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/customer/customer-reference.spec.ts b/models/commons/src/reference/presets/customer/customer-reference.spec.ts
deleted file mode 100644
index 99e94ccda..000000000
--- a/models/commons/src/reference/presets/customer/customer-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReference } from '../../types';
-import customerReference from './customer-reference';
-
-it('should build a customer reference', () => {
-  const built = customerReference().build<TReference<'customer'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'customer',
-  });
-});
diff --git a/models/commons/src/reference/presets/customer/customer-reference.ts b/models/commons/src/reference/presets/customer/customer-reference.ts
deleted file mode 100644
index 75dee4bc8..000000000
--- a/models/commons/src/reference/presets/customer/customer-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const customerReference = (): TReferenceBuilder =>
-  Reference().typeId('customer');
-
-export default customerReference;
diff --git a/models/commons/src/reference/presets/customer/index.ts b/models/commons/src/reference/presets/customer/index.ts
deleted file mode 100644
index 49e7038ac..000000000
--- a/models/commons/src/reference/presets/customer/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './customer-reference';
diff --git a/models/commons/src/reference/presets/direct-discount-reference.ts b/models/commons/src/reference/presets/direct-discount-reference.ts
new file mode 100644
index 000000000..82efdf718
--- /dev/null
+++ b/models/commons/src/reference/presets/direct-discount-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.directDiscount);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/direct-discount/direct-discount-reference.spec.ts b/models/commons/src/reference/presets/direct-discount/direct-discount-reference.spec.ts
deleted file mode 100644
index 3e859a931..000000000
--- a/models/commons/src/reference/presets/direct-discount/direct-discount-reference.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { TReference } from '../../types';
-import directDiscountReference from './direct-discount-reference';
-
-it('should build a direct-discount reference', () => {
-  const built =
-    directDiscountReference().build<TReference<'direct-discount'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'direct-discount',
-  });
-});
diff --git a/models/commons/src/reference/presets/direct-discount/direct-discount-reference.ts b/models/commons/src/reference/presets/direct-discount/direct-discount-reference.ts
deleted file mode 100644
index 65aeb83c8..000000000
--- a/models/commons/src/reference/presets/direct-discount/direct-discount-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const directDiscountReference = (): TReferenceBuilder =>
-  Reference().typeId('direct-discount');
-
-export default directDiscountReference;
diff --git a/models/commons/src/reference/presets/direct-discount/index.ts b/models/commons/src/reference/presets/direct-discount/index.ts
deleted file mode 100644
index fbd349c53..000000000
--- a/models/commons/src/reference/presets/direct-discount/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './direct-discount-reference';
diff --git a/models/commons/src/reference/presets/discount-code-reference.ts b/models/commons/src/reference/presets/discount-code-reference.ts
new file mode 100644
index 000000000..39c83ff5e
--- /dev/null
+++ b/models/commons/src/reference/presets/discount-code-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.discountCode);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/discount-code/discount-code-reference.spec.ts b/models/commons/src/reference/presets/discount-code/discount-code-reference.spec.ts
deleted file mode 100644
index 21b49100c..000000000
--- a/models/commons/src/reference/presets/discount-code/discount-code-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReference } from '../../types';
-import discountCodeReference from './discount-code-reference';
-
-it('should build a discount-code reference', () => {
-  const built = discountCodeReference().build<TReference<'discount-code'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'discount-code',
-  });
-});
diff --git a/models/commons/src/reference/presets/discount-code/discount-code-reference.ts b/models/commons/src/reference/presets/discount-code/discount-code-reference.ts
deleted file mode 100644
index 49b9d9755..000000000
--- a/models/commons/src/reference/presets/discount-code/discount-code-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const discountCodeReference = (): TReferenceBuilder =>
-  Reference().typeId('discount-code');
-
-export default discountCodeReference;
diff --git a/models/commons/src/reference/presets/discount-code/index.ts b/models/commons/src/reference/presets/discount-code/index.ts
deleted file mode 100644
index a905bd66f..000000000
--- a/models/commons/src/reference/presets/discount-code/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './discount-code-reference';
diff --git a/models/commons/src/reference/presets/extension-reference.ts b/models/commons/src/reference/presets/extension-reference.ts
new file mode 100644
index 000000000..408d9ad94
--- /dev/null
+++ b/models/commons/src/reference/presets/extension-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.extension);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/extension/extension-reference.spec.ts b/models/commons/src/reference/presets/extension/extension-reference.spec.ts
deleted file mode 100644
index 9eceeed6b..000000000
--- a/models/commons/src/reference/presets/extension/extension-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReference } from '../../types';
-import extensionReference from './extension-reference';
-
-it('should build an extension reference', () => {
-  const built = extensionReference().build<TReference<'extension'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'extension',
-  });
-});
diff --git a/models/commons/src/reference/presets/extension/extension-reference.ts b/models/commons/src/reference/presets/extension/extension-reference.ts
deleted file mode 100644
index a9569e645..000000000
--- a/models/commons/src/reference/presets/extension/extension-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const extensionReference = (): TReferenceBuilder =>
-  Reference().typeId('extension');
-
-export default extensionReference;
diff --git a/models/commons/src/reference/presets/extension/index.ts b/models/commons/src/reference/presets/extension/index.ts
deleted file mode 100644
index 303769f35..000000000
--- a/models/commons/src/reference/presets/extension/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './extension-reference';
diff --git a/models/commons/src/reference/presets/index.ts b/models/commons/src/reference/presets/index.ts
index 9b5a154ff..3b07b0cb7 100644
--- a/models/commons/src/reference/presets/index.ts
+++ b/models/commons/src/reference/presets/index.ts
@@ -1,75 +1,147 @@
-import associateRoleReference from './associate-role';
-import attributeGroupReference from './attribute-group';
-import businessUnitReference from './business-unit';
-import cartReference from './cart';
-import cartDiscountReference from './cart-discount';
-import categoryReference from './category';
-import channelReference from './channel';
-import customerReference from './customer';
-import customerGroupReference from './customer-group';
-import directDiscountReference from './direct-discount';
-import discountCodeReference from './discount-code';
-import extensionReference from './extension';
-import inventoryEntryReference from './inventory-entry';
-import keyValueDocumentReference from './key-value-document';
-import orderReference from './order';
-import orderEditReference from './order-edit';
-import paymentReference from './payment';
-import productReference from './product';
-import productDiscountReference from './product-discount';
-import productPriceReference from './product-price';
-import productSelectionReference from './product-selection';
-import productTypeReference from './product-type';
-import quoteReference from './quote';
-import quoteRequestReference from './quote-request';
-import reviewReference from './review';
-import shippingMethodReference from './shipping-method';
-import shoppingListReference from './shopping-list';
-import stagedQuoteReference from './staged-quote';
-import standalonePriceReference from './standalone-price';
-import stateReference from './state';
-import storeReference from './store';
-import subscriptionReference from './subscription';
-import taxCategoryReference from './tax-category';
-import typeReference from './type';
-import zoneReference from './zone';
+import associateRoleReference from './associate-role-reference';
+import attributeGroupReference from './attribute-group-reference';
+import businessUnitReference from './business-unit-reference';
+import cartDiscountReference from './cart-discount-reference';
+import cartReference from './cart-reference';
+import categoryReference from './category-reference';
+import channelReference from './channel-reference';
+import customerGroupReference from './customer-group-reference';
+import customerReference from './customer-reference';
+import directDiscountReference from './direct-discount-reference';
+import discountCodeReference from './discount-code-reference';
+import extensionReference from './extension-reference';
+import inventoryEntryReference from './inventory-entry-reference';
+import keyValueDocumentReference from './key-value-document-reference';
+import orderEditReference from './order-edit-reference';
+import orderReference from './order-reference';
+import paymentReference from './payment-reference';
+import productDiscountReference from './product-discount-reference';
+import productPriceReference from './product-price-reference';
+import productReference from './product-reference';
+import productSelectionReference from './product-selection-reference';
+import productTypeReference from './product-type-reference';
+import quoteReference from './quote-reference';
+import quoteRequestReference from './quote-request-reference';
+import reviewReference from './review-reference';
+import shippingMethodReference from './shipping-method-reference';
+import shoppingListReference from './shopping-list-reference';
+import stagedQuoteReference from './staged-quote-reference';
+import standalonePriceReference from './standalone-price-reference';
+import stateReference from './state-reference';
+import storeReference from './store-reference';
+import subscriptionReference from './subscription-reference';
+import taxCategoryReference from './tax-category-reference';
+import typeReference from './type-reference';
+import zoneReference from './zone-reference';
 
-const presets = {
-  associateRoleReference,
-  attributeGroupReference,
-  businessUnitReference,
-  cartDiscountReference,
-  cartReference,
-  categoryReference,
-  channelReference,
-  customerReference,
-  customerGroupReference,
-  directDiscountReference,
-  discountCodeReference,
-  extensionReference,
-  inventoryEntryReference,
-  keyValueDocumentReference,
-  orderReference,
-  orderEditReference,
-  paymentReference,
-  productReference,
-  productDiscountReference,
-  productPriceReference,
-  productSelectionReference,
-  productTypeReference,
-  quoteReference,
-  quoteRequestReference,
-  reviewReference,
-  shippingMethodReference,
-  shoppingListReference,
-  stagedQuoteReference,
-  standalonePriceReference,
-  stateReference,
-  storeReference,
-  subscriptionReference,
-  taxCategoryReference,
-  typeReference,
-  zoneReference,
+export const restPresets = {
+  associateRoleReference: associateRoleReference.restPreset,
+  attributeGroupReference: attributeGroupReference.restPreset,
+  businessUnitReference: businessUnitReference.restPreset,
+  cartDiscountReference: cartDiscountReference.restPreset,
+  cartReference: cartReference.restPreset,
+  categoryReference: categoryReference.restPreset,
+  channelReference: channelReference.restPreset,
+  customerReference: customerReference.restPreset,
+  customerGroupReference: customerGroupReference.restPreset,
+  directDiscountReference: directDiscountReference.restPreset,
+  discountCodeReference: discountCodeReference.restPreset,
+  extensionReference: extensionReference.restPreset,
+  inventoryEntryReference: inventoryEntryReference.restPreset,
+  keyValueDocumentReference: keyValueDocumentReference.restPreset,
+  orderReference: orderReference.restPreset,
+  orderEditReference: orderEditReference.restPreset,
+  paymentReference: paymentReference.restPreset,
+  productReference: productReference.restPreset,
+  productDiscountReference: productDiscountReference.restPreset,
+  productPriceReference: productPriceReference.restPreset,
+  productSelectionReference: productSelectionReference.restPreset,
+  productTypeReference: productTypeReference.restPreset,
+  quoteReference: quoteReference.restPreset,
+  quoteRequestReference: quoteRequestReference.restPreset,
+  reviewReference: reviewReference.restPreset,
+  shippingMethodReference: shippingMethodReference.restPreset,
+  shoppingListReference: shoppingListReference.restPreset,
+  stagedQuoteReference: stagedQuoteReference.restPreset,
+  standalonePriceReference: standalonePriceReference.restPreset,
+  stateReference: stateReference.restPreset,
+  storeReference: storeReference.restPreset,
+  subscriptionReference: subscriptionReference.restPreset,
+  taxCategoryReference: taxCategoryReference.restPreset,
+  typeReference: typeReference.restPreset,
+  zoneReference: zoneReference.restPreset,
+};
+export const graphqlPresets = {
+  associateRoleReference: associateRoleReference.graphqlPreset,
+  attributeGroupReference: attributeGroupReference.graphqlPreset,
+  businessUnitReference: businessUnitReference.graphqlPreset,
+  cartDiscountReference: cartDiscountReference.graphqlPreset,
+  cartReference: cartReference.graphqlPreset,
+  categoryReference: categoryReference.graphqlPreset,
+  channelReference: channelReference.graphqlPreset,
+  customerReference: customerReference.graphqlPreset,
+  customerGroupReference: customerGroupReference.graphqlPreset,
+  directDiscountReference: directDiscountReference.graphqlPreset,
+  discountCodeReference: discountCodeReference.graphqlPreset,
+  extensionReference: extensionReference.graphqlPreset,
+  inventoryEntryReference: inventoryEntryReference.graphqlPreset,
+  keyValueDocumentReference: keyValueDocumentReference.graphqlPreset,
+  orderReference: orderReference.graphqlPreset,
+  orderEditReference: orderEditReference.graphqlPreset,
+  paymentReference: paymentReference.graphqlPreset,
+  productReference: productReference.graphqlPreset,
+  productDiscountReference: productDiscountReference.graphqlPreset,
+  productPriceReference: productPriceReference.graphqlPreset,
+  productSelectionReference: productSelectionReference.graphqlPreset,
+  productTypeReference: productTypeReference.graphqlPreset,
+  quoteReference: quoteReference.graphqlPreset,
+  quoteRequestReference: quoteRequestReference.graphqlPreset,
+  reviewReference: reviewReference.graphqlPreset,
+  shippingMethodReference: shippingMethodReference.graphqlPreset,
+  shoppingListReference: shoppingListReference.graphqlPreset,
+  stagedQuoteReference: stagedQuoteReference.graphqlPreset,
+  standalonePriceReference: standalonePriceReference.graphqlPreset,
+  stateReference: stateReference.graphqlPreset,
+  storeReference: storeReference.graphqlPreset,
+  subscriptionReference: subscriptionReference.graphqlPreset,
+  taxCategoryReference: taxCategoryReference.graphqlPreset,
+  typeReference: typeReference.graphqlPreset,
+  zoneReference: zoneReference.graphqlPreset,
+};
+export const compatPresets = {
+  associateRoleReference: associateRoleReference.compatPreset,
+  attributeGroupReference: attributeGroupReference.compatPreset,
+  businessUnitReference: businessUnitReference.compatPreset,
+  cartDiscountReference: cartDiscountReference.compatPreset,
+  cartReference: cartReference.compatPreset,
+  categoryReference: categoryReference.compatPreset,
+  channelReference: channelReference.compatPreset,
+  customerReference: customerReference.compatPreset,
+  customerGroupReference: customerGroupReference.compatPreset,
+  directDiscountReference: directDiscountReference.compatPreset,
+  discountCodeReference: discountCodeReference.compatPreset,
+  extensionReference: extensionReference.compatPreset,
+  inventoryEntryReference: inventoryEntryReference.compatPreset,
+  keyValueDocumentReference: keyValueDocumentReference.compatPreset,
+  orderReference: orderReference.compatPreset,
+  orderEditReference: orderEditReference.compatPreset,
+  paymentReference: paymentReference.compatPreset,
+  productReference: productReference.compatPreset,
+  productDiscountReference: productDiscountReference.compatPreset,
+  productPriceReference: productPriceReference.compatPreset,
+  productSelectionReference: productSelectionReference.compatPreset,
+  productTypeReference: productTypeReference.compatPreset,
+  quoteReference: quoteReference.compatPreset,
+  quoteRequestReference: quoteRequestReference.compatPreset,
+  reviewReference: reviewReference.compatPreset,
+  shippingMethodReference: shippingMethodReference.compatPreset,
+  shoppingListReference: shoppingListReference.compatPreset,
+  stagedQuoteReference: stagedQuoteReference.compatPreset,
+  standalonePriceReference: standalonePriceReference.compatPreset,
+  stateReference: stateReference.compatPreset,
+  storeReference: storeReference.compatPreset,
+  subscriptionReference: subscriptionReference.compatPreset,
+  taxCategoryReference: taxCategoryReference.compatPreset,
+  typeReference: typeReference.compatPreset,
+  zoneReference: zoneReference.compatPreset,
 };
-
-export default presets;
diff --git a/models/commons/src/reference/presets/inventory-entry-reference.ts b/models/commons/src/reference/presets/inventory-entry-reference.ts
new file mode 100644
index 000000000..f981267fa
--- /dev/null
+++ b/models/commons/src/reference/presets/inventory-entry-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.inventoryEntry);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/inventory-entry/index.ts b/models/commons/src/reference/presets/inventory-entry/index.ts
deleted file mode 100644
index 221089d70..000000000
--- a/models/commons/src/reference/presets/inventory-entry/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './inventory-entry-reference';
diff --git a/models/commons/src/reference/presets/inventory-entry/inventory-entry-reference.spec.ts b/models/commons/src/reference/presets/inventory-entry/inventory-entry-reference.spec.ts
deleted file mode 100644
index 9397883d9..000000000
--- a/models/commons/src/reference/presets/inventory-entry/inventory-entry-reference.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { TReference } from '../../types';
-import inventoryEntryReference from './inventory-entry-reference';
-
-it('should build an inventory-entry reference', () => {
-  const built =
-    inventoryEntryReference().build<TReference<'inventory-entry'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'inventory-entry',
-  });
-});
diff --git a/models/commons/src/reference/presets/inventory-entry/inventory-entry-reference.ts b/models/commons/src/reference/presets/inventory-entry/inventory-entry-reference.ts
deleted file mode 100644
index 33fba5475..000000000
--- a/models/commons/src/reference/presets/inventory-entry/inventory-entry-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const inventoryEntryReference = (): TReferenceBuilder =>
-  Reference().typeId('inventory-entry');
-
-export default inventoryEntryReference;
diff --git a/models/commons/src/reference/presets/key-value-document-reference.ts b/models/commons/src/reference/presets/key-value-document-reference.ts
new file mode 100644
index 000000000..bb6c82001
--- /dev/null
+++ b/models/commons/src/reference/presets/key-value-document-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.keyValueDocument);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/key-value-document/index.ts b/models/commons/src/reference/presets/key-value-document/index.ts
deleted file mode 100644
index 77f9d3c45..000000000
--- a/models/commons/src/reference/presets/key-value-document/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './key-value-document-reference';
diff --git a/models/commons/src/reference/presets/key-value-document/key-value-document-reference.spec.ts b/models/commons/src/reference/presets/key-value-document/key-value-document-reference.spec.ts
deleted file mode 100644
index a2c1a3227..000000000
--- a/models/commons/src/reference/presets/key-value-document/key-value-document-reference.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { TReference } from '../../types';
-import keyValueDocumentReference from './key-value-document-reference';
-
-it('should build a key-value-document reference', () => {
-  const built =
-    keyValueDocumentReference().build<TReference<'key-value-document'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'key-value-document',
-  });
-});
diff --git a/models/commons/src/reference/presets/key-value-document/key-value-document-reference.ts b/models/commons/src/reference/presets/key-value-document/key-value-document-reference.ts
deleted file mode 100644
index d47c29e43..000000000
--- a/models/commons/src/reference/presets/key-value-document/key-value-document-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const keyValueDocumentReference = (): TReferenceBuilder =>
-  Reference().typeId('key-value-document');
-
-export default keyValueDocumentReference;
diff --git a/models/commons/src/reference/presets/order-edit-reference.ts b/models/commons/src/reference/presets/order-edit-reference.ts
new file mode 100644
index 000000000..d3be40afc
--- /dev/null
+++ b/models/commons/src/reference/presets/order-edit-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.orderEdit);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/order-edit/index.ts b/models/commons/src/reference/presets/order-edit/index.ts
deleted file mode 100644
index 5c2eff527..000000000
--- a/models/commons/src/reference/presets/order-edit/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './order-edit-reference';
diff --git a/models/commons/src/reference/presets/order-edit/order-edit-reference.spec.ts b/models/commons/src/reference/presets/order-edit/order-edit-reference.spec.ts
deleted file mode 100644
index 1eb8cc36e..000000000
--- a/models/commons/src/reference/presets/order-edit/order-edit-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReference } from '../../types';
-import orderEditReference from './order-edit-reference';
-
-it('should build an order-edit reference', () => {
-  const built = orderEditReference().build<TReference<'order-edit'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'order-edit',
-  });
-});
diff --git a/models/commons/src/reference/presets/order-edit/order-edit-reference.ts b/models/commons/src/reference/presets/order-edit/order-edit-reference.ts
deleted file mode 100644
index 858748ea7..000000000
--- a/models/commons/src/reference/presets/order-edit/order-edit-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const orderEditReference = (): TReferenceBuilder =>
-  Reference().typeId('order-edit');
-
-export default orderEditReference;
diff --git a/models/commons/src/reference/presets/order-reference.ts b/models/commons/src/reference/presets/order-reference.ts
new file mode 100644
index 000000000..539cd79c9
--- /dev/null
+++ b/models/commons/src/reference/presets/order-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.order);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/order/index.ts b/models/commons/src/reference/presets/order/index.ts
deleted file mode 100644
index 8e7cef222..000000000
--- a/models/commons/src/reference/presets/order/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './order-reference';
diff --git a/models/commons/src/reference/presets/order/order-reference.spec.ts b/models/commons/src/reference/presets/order/order-reference.spec.ts
deleted file mode 100644
index 24b71778a..000000000
--- a/models/commons/src/reference/presets/order/order-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReference } from '../../types';
-import orderReference from './order-reference';
-
-it('should build an order reference', () => {
-  const built = orderReference().build<TReference<'order'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'order',
-  });
-});
diff --git a/models/commons/src/reference/presets/order/order-reference.ts b/models/commons/src/reference/presets/order/order-reference.ts
deleted file mode 100644
index ec9cb5817..000000000
--- a/models/commons/src/reference/presets/order/order-reference.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const orderReference = (): TReferenceBuilder => Reference().typeId('order');
-
-export default orderReference;
diff --git a/models/commons/src/reference/presets/payment-reference.ts b/models/commons/src/reference/presets/payment-reference.ts
new file mode 100644
index 000000000..9eecbd58b
--- /dev/null
+++ b/models/commons/src/reference/presets/payment-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.payment);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/payment/index.ts b/models/commons/src/reference/presets/payment/index.ts
deleted file mode 100644
index fe1455935..000000000
--- a/models/commons/src/reference/presets/payment/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './payment-reference';
diff --git a/models/commons/src/reference/presets/payment/payment-reference.spec.ts b/models/commons/src/reference/presets/payment/payment-reference.spec.ts
deleted file mode 100644
index 8db62a677..000000000
--- a/models/commons/src/reference/presets/payment/payment-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReference } from '../../types';
-import paymentReference from './payment-reference';
-
-it('should build a payment reference', () => {
-  const built = paymentReference().build<TReference<'payment'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'payment',
-  });
-});
diff --git a/models/commons/src/reference/presets/payment/payment-reference.ts b/models/commons/src/reference/presets/payment/payment-reference.ts
deleted file mode 100644
index 9845cedd2..000000000
--- a/models/commons/src/reference/presets/payment/payment-reference.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const paymentReference = (): TReferenceBuilder => Reference().typeId('payment');
-
-export default paymentReference;
diff --git a/models/commons/src/reference/presets/product-discount-reference.ts b/models/commons/src/reference/presets/product-discount-reference.ts
new file mode 100644
index 000000000..259f147f8
--- /dev/null
+++ b/models/commons/src/reference/presets/product-discount-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.productDiscount);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/product-discount/index.ts b/models/commons/src/reference/presets/product-discount/index.ts
deleted file mode 100644
index b11855524..000000000
--- a/models/commons/src/reference/presets/product-discount/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './product-discount-reference';
diff --git a/models/commons/src/reference/presets/product-discount/product-discount-reference.spec.ts b/models/commons/src/reference/presets/product-discount/product-discount-reference.spec.ts
deleted file mode 100644
index 2e8e10600..000000000
--- a/models/commons/src/reference/presets/product-discount/product-discount-reference.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { TReference } from '../../types';
-import productDiscountReference from './product-discount-reference';
-
-it('should build a product-discount reference', () => {
-  const built =
-    productDiscountReference().build<TReference<'product-discount'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'product-discount',
-  });
-});
diff --git a/models/commons/src/reference/presets/product-discount/product-discount-reference.ts b/models/commons/src/reference/presets/product-discount/product-discount-reference.ts
deleted file mode 100644
index fa3ddce4f..000000000
--- a/models/commons/src/reference/presets/product-discount/product-discount-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const productDiscountReference = (): TReferenceBuilder =>
-  Reference().typeId('product-discount');
-
-export default productDiscountReference;
diff --git a/models/commons/src/reference/presets/product-price-reference.ts b/models/commons/src/reference/presets/product-price-reference.ts
new file mode 100644
index 000000000..e6d9d8529
--- /dev/null
+++ b/models/commons/src/reference/presets/product-price-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.productPrice);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/product-price/index.ts b/models/commons/src/reference/presets/product-price/index.ts
deleted file mode 100644
index 0bd353098..000000000
--- a/models/commons/src/reference/presets/product-price/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './product-price-reference';
diff --git a/models/commons/src/reference/presets/product-price/product-price-reference.spec.ts b/models/commons/src/reference/presets/product-price/product-price-reference.spec.ts
deleted file mode 100644
index 2c58e7f82..000000000
--- a/models/commons/src/reference/presets/product-price/product-price-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReference } from '../../types';
-import productPriceReference from './product-price-reference';
-
-it('should build a product-price reference', () => {
-  const built = productPriceReference().build<TReference<'product-price'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'product-price',
-  });
-});
diff --git a/models/commons/src/reference/presets/product-price/product-price-reference.ts b/models/commons/src/reference/presets/product-price/product-price-reference.ts
deleted file mode 100644
index 09bacd5fa..000000000
--- a/models/commons/src/reference/presets/product-price/product-price-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const productPriceReference = (): TReferenceBuilder =>
-  Reference().typeId('product-price');
-
-export default productPriceReference;
diff --git a/models/commons/src/reference/presets/product-reference.ts b/models/commons/src/reference/presets/product-reference.ts
new file mode 100644
index 000000000..3203a80c4
--- /dev/null
+++ b/models/commons/src/reference/presets/product-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.product);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/product-selection-reference.ts b/models/commons/src/reference/presets/product-selection-reference.ts
new file mode 100644
index 000000000..e7ab530f7
--- /dev/null
+++ b/models/commons/src/reference/presets/product-selection-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.productSelection);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/product-selection/index.ts b/models/commons/src/reference/presets/product-selection/index.ts
deleted file mode 100644
index 9ac7a7ce2..000000000
--- a/models/commons/src/reference/presets/product-selection/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './product-selection-reference';
diff --git a/models/commons/src/reference/presets/product-selection/product-selection-reference.spec.ts b/models/commons/src/reference/presets/product-selection/product-selection-reference.spec.ts
deleted file mode 100644
index 3891127e9..000000000
--- a/models/commons/src/reference/presets/product-selection/product-selection-reference.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { TReference } from '../../types';
-import productSelectionReference from './product-selection-reference';
-
-it('should build a product-selection reference', () => {
-  const built =
-    productSelectionReference().build<TReference<'product-selection'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'product-selection',
-  });
-});
diff --git a/models/commons/src/reference/presets/product-selection/product-selection-reference.ts b/models/commons/src/reference/presets/product-selection/product-selection-reference.ts
deleted file mode 100644
index 1e4559232..000000000
--- a/models/commons/src/reference/presets/product-selection/product-selection-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const productSelectionReference = (): TReferenceBuilder =>
-  Reference().typeId('product-selection');
-
-export default productSelectionReference;
diff --git a/models/commons/src/reference/presets/product-type-reference.ts b/models/commons/src/reference/presets/product-type-reference.ts
new file mode 100644
index 000000000..4ad3ff7e8
--- /dev/null
+++ b/models/commons/src/reference/presets/product-type-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.productType);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/product-type/index.ts b/models/commons/src/reference/presets/product-type/index.ts
deleted file mode 100644
index e251d7f48..000000000
--- a/models/commons/src/reference/presets/product-type/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './product-type-reference';
diff --git a/models/commons/src/reference/presets/product-type/product-type-reference.spec.ts b/models/commons/src/reference/presets/product-type/product-type-reference.spec.ts
deleted file mode 100644
index 6d2cdeedf..000000000
--- a/models/commons/src/reference/presets/product-type/product-type-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReference } from '../../types';
-import productTypeReference from './product-type-reference';
-
-it('should build a product-type reference', () => {
-  const built = productTypeReference().build<TReference<'product-type'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'product-type',
-  });
-});
diff --git a/models/commons/src/reference/presets/product-type/product-type-reference.ts b/models/commons/src/reference/presets/product-type/product-type-reference.ts
deleted file mode 100644
index bbd3000e2..000000000
--- a/models/commons/src/reference/presets/product-type/product-type-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const productTypeReference = (): TReferenceBuilder =>
-  Reference().typeId('product-type');
-
-export default productTypeReference;
diff --git a/models/commons/src/reference/presets/product/index.ts b/models/commons/src/reference/presets/product/index.ts
deleted file mode 100644
index 4de335030..000000000
--- a/models/commons/src/reference/presets/product/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './product-reference';
diff --git a/models/commons/src/reference/presets/product/product-reference.spec.ts b/models/commons/src/reference/presets/product/product-reference.spec.ts
deleted file mode 100644
index f29ae3385..000000000
--- a/models/commons/src/reference/presets/product/product-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReference } from '../../types';
-import productReference from './product-reference';
-
-it('should build a product reference', () => {
-  const built = productReference().build<TReference<'product'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'product',
-  });
-});
diff --git a/models/commons/src/reference/presets/product/product-reference.ts b/models/commons/src/reference/presets/product/product-reference.ts
deleted file mode 100644
index 965fcfdb9..000000000
--- a/models/commons/src/reference/presets/product/product-reference.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const productReference = (): TReferenceBuilder => Reference().typeId('product');
-
-export default productReference;
diff --git a/models/commons/src/reference/presets/quote-reference.ts b/models/commons/src/reference/presets/quote-reference.ts
new file mode 100644
index 000000000..7f9fda0d8
--- /dev/null
+++ b/models/commons/src/reference/presets/quote-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.quote);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/quote-request-reference.ts b/models/commons/src/reference/presets/quote-request-reference.ts
new file mode 100644
index 000000000..765f056f5
--- /dev/null
+++ b/models/commons/src/reference/presets/quote-request-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.quoteRequest);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/quote-request/index.ts b/models/commons/src/reference/presets/quote-request/index.ts
deleted file mode 100644
index 2b327ba45..000000000
--- a/models/commons/src/reference/presets/quote-request/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './quote-request-reference';
diff --git a/models/commons/src/reference/presets/quote-request/quote-request-reference.ts b/models/commons/src/reference/presets/quote-request/quote-request-reference.ts
deleted file mode 100644
index e3d137352..000000000
--- a/models/commons/src/reference/presets/quote-request/quote-request-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const quoteRequestReference = (): TReferenceBuilder =>
-  Reference().typeId('quote-request');
-
-export default quoteRequestReference;
diff --git a/models/commons/src/reference/presets/quote-request/quote-request.spec.ts b/models/commons/src/reference/presets/quote-request/quote-request.spec.ts
deleted file mode 100644
index b2bed7a39..000000000
--- a/models/commons/src/reference/presets/quote-request/quote-request.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReference } from '../../types';
-import quoteRequestReference from './quote-request-reference';
-
-it('should build a quote-request reference', () => {
-  const built = quoteRequestReference().build<TReference<'quote-request'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'quote-request',
-  });
-});
diff --git a/models/commons/src/reference/presets/quote/index.ts b/models/commons/src/reference/presets/quote/index.ts
deleted file mode 100644
index a210c5b03..000000000
--- a/models/commons/src/reference/presets/quote/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './quote-reference';
diff --git a/models/commons/src/reference/presets/quote/quote-reference.spec.ts b/models/commons/src/reference/presets/quote/quote-reference.spec.ts
deleted file mode 100644
index 889018fe3..000000000
--- a/models/commons/src/reference/presets/quote/quote-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReference } from '../../types';
-import quoteReference from './quote-reference';
-
-it('should build a quote reference', () => {
-  const built = quoteReference().build<TReference<'quote'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'quote',
-  });
-});
diff --git a/models/commons/src/reference/presets/quote/quote-reference.ts b/models/commons/src/reference/presets/quote/quote-reference.ts
deleted file mode 100644
index 45c3302fe..000000000
--- a/models/commons/src/reference/presets/quote/quote-reference.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const quoteReference = (): TReferenceBuilder => Reference().typeId('quote');
-
-export default quoteReference;
diff --git a/models/commons/src/reference/presets/review-reference.ts b/models/commons/src/reference/presets/review-reference.ts
new file mode 100644
index 000000000..f2c3c7f2b
--- /dev/null
+++ b/models/commons/src/reference/presets/review-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.review);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/review/index.ts b/models/commons/src/reference/presets/review/index.ts
deleted file mode 100644
index 41ba26e16..000000000
--- a/models/commons/src/reference/presets/review/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './review-reference';
diff --git a/models/commons/src/reference/presets/review/review-reference.spec.ts b/models/commons/src/reference/presets/review/review-reference.spec.ts
deleted file mode 100644
index 7c7bf3929..000000000
--- a/models/commons/src/reference/presets/review/review-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReference } from '../../types';
-import reviewReference from './review-reference';
-
-it('should build a review reference', () => {
-  const built = reviewReference().build<TReference<'review'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'review',
-  });
-});
diff --git a/models/commons/src/reference/presets/review/review-reference.ts b/models/commons/src/reference/presets/review/review-reference.ts
deleted file mode 100644
index 34dcc7f00..000000000
--- a/models/commons/src/reference/presets/review/review-reference.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const reviewReference = (): TReferenceBuilder => Reference().typeId('review');
-
-export default reviewReference;
diff --git a/models/commons/src/reference/presets/shipping-method-reference.ts b/models/commons/src/reference/presets/shipping-method-reference.ts
new file mode 100644
index 000000000..df93acfcb
--- /dev/null
+++ b/models/commons/src/reference/presets/shipping-method-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.shippingMethod);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/shipping-method/index.ts b/models/commons/src/reference/presets/shipping-method/index.ts
deleted file mode 100644
index 1680242e2..000000000
--- a/models/commons/src/reference/presets/shipping-method/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './shipping-method-reference';
diff --git a/models/commons/src/reference/presets/shipping-method/shipping-method-reference.spec.ts b/models/commons/src/reference/presets/shipping-method/shipping-method-reference.spec.ts
deleted file mode 100644
index f304053b1..000000000
--- a/models/commons/src/reference/presets/shipping-method/shipping-method-reference.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { TReference } from '../../types';
-import shippingMethodReference from './shipping-method-reference';
-
-it('should build a shipping-method reference', () => {
-  const built =
-    shippingMethodReference().build<TReference<'shipping-method'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'shipping-method',
-  });
-});
diff --git a/models/commons/src/reference/presets/shipping-method/shipping-method-reference.ts b/models/commons/src/reference/presets/shipping-method/shipping-method-reference.ts
deleted file mode 100644
index 8d7cd30a5..000000000
--- a/models/commons/src/reference/presets/shipping-method/shipping-method-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const shippingMethodReference = (): TReferenceBuilder =>
-  Reference().typeId('shipping-method');
-
-export default shippingMethodReference;
diff --git a/models/commons/src/reference/presets/shopping-list-reference.ts b/models/commons/src/reference/presets/shopping-list-reference.ts
new file mode 100644
index 000000000..e68cc4c31
--- /dev/null
+++ b/models/commons/src/reference/presets/shopping-list-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.shoppingList);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/shopping-list/index.ts b/models/commons/src/reference/presets/shopping-list/index.ts
deleted file mode 100644
index 983d68ae2..000000000
--- a/models/commons/src/reference/presets/shopping-list/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './shopping-list-reference';
diff --git a/models/commons/src/reference/presets/shopping-list/shopping-list-reference.spec.ts b/models/commons/src/reference/presets/shopping-list/shopping-list-reference.spec.ts
deleted file mode 100644
index d6310297b..000000000
--- a/models/commons/src/reference/presets/shopping-list/shopping-list-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReference } from '../../types';
-import shoppingListReference from './shopping-list-reference';
-
-it('should build a shopping-list reference', () => {
-  const built = shoppingListReference().build<TReference<'shopping-list'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'shopping-list',
-  });
-});
diff --git a/models/commons/src/reference/presets/shopping-list/shopping-list-reference.ts b/models/commons/src/reference/presets/shopping-list/shopping-list-reference.ts
deleted file mode 100644
index a1ed28d3e..000000000
--- a/models/commons/src/reference/presets/shopping-list/shopping-list-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const shoppingListReference = (): TReferenceBuilder =>
-  Reference().typeId('shopping-list');
-
-export default shoppingListReference;
diff --git a/models/commons/src/reference/presets/staged-quote-reference.ts b/models/commons/src/reference/presets/staged-quote-reference.ts
new file mode 100644
index 000000000..a36226aef
--- /dev/null
+++ b/models/commons/src/reference/presets/staged-quote-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.stagedQuote);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/staged-quote/index.ts b/models/commons/src/reference/presets/staged-quote/index.ts
deleted file mode 100644
index 01d20b1d2..000000000
--- a/models/commons/src/reference/presets/staged-quote/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './staged-quote-reference';
diff --git a/models/commons/src/reference/presets/staged-quote/staged-quote-reference.spec.ts b/models/commons/src/reference/presets/staged-quote/staged-quote-reference.spec.ts
deleted file mode 100644
index 594c67678..000000000
--- a/models/commons/src/reference/presets/staged-quote/staged-quote-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReference } from '../../types';
-import stagedQuoteReference from './staged-quote-reference';
-
-it('should build a staged-quote reference', () => {
-  const built = stagedQuoteReference().build<TReference<'staged-quote'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'staged-quote',
-  });
-});
diff --git a/models/commons/src/reference/presets/staged-quote/staged-quote-reference.ts b/models/commons/src/reference/presets/staged-quote/staged-quote-reference.ts
deleted file mode 100644
index 5799a9c82..000000000
--- a/models/commons/src/reference/presets/staged-quote/staged-quote-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const stagedQuoteReference = (): TReferenceBuilder =>
-  Reference().typeId('staged-quote');
-
-export default stagedQuoteReference;
diff --git a/models/commons/src/reference/presets/standalone-price-reference.ts b/models/commons/src/reference/presets/standalone-price-reference.ts
new file mode 100644
index 000000000..f52e0d252
--- /dev/null
+++ b/models/commons/src/reference/presets/standalone-price-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.standalonePrice);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/standalone-price/index.ts b/models/commons/src/reference/presets/standalone-price/index.ts
deleted file mode 100644
index 80e15b64a..000000000
--- a/models/commons/src/reference/presets/standalone-price/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './standalone-price-reference';
diff --git a/models/commons/src/reference/presets/standalone-price/standalone-price-reference.spec.ts b/models/commons/src/reference/presets/standalone-price/standalone-price-reference.spec.ts
deleted file mode 100644
index 168e500d7..000000000
--- a/models/commons/src/reference/presets/standalone-price/standalone-price-reference.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { TReference } from '../../types';
-import standalonePriceReference from './standalone-price-reference';
-
-it('should build a standalone-price reference', () => {
-  const built =
-    standalonePriceReference().build<TReference<'standalone-price'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'standalone-price',
-  });
-});
diff --git a/models/commons/src/reference/presets/standalone-price/standalone-price-reference.ts b/models/commons/src/reference/presets/standalone-price/standalone-price-reference.ts
deleted file mode 100644
index 65e2e3c92..000000000
--- a/models/commons/src/reference/presets/standalone-price/standalone-price-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const standalonePriceReference = (): TReferenceBuilder =>
-  Reference().typeId('standalone-price');
-
-export default standalonePriceReference;
diff --git a/models/commons/src/reference/presets/state-reference.ts b/models/commons/src/reference/presets/state-reference.ts
new file mode 100644
index 000000000..8bbfdb3ce
--- /dev/null
+++ b/models/commons/src/reference/presets/state-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.state);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/state/index.ts b/models/commons/src/reference/presets/state/index.ts
deleted file mode 100644
index 266395120..000000000
--- a/models/commons/src/reference/presets/state/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './state-reference';
diff --git a/models/commons/src/reference/presets/state/state-reference.spec.ts b/models/commons/src/reference/presets/state/state-reference.spec.ts
deleted file mode 100644
index 02bc29956..000000000
--- a/models/commons/src/reference/presets/state/state-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReference } from '../../types';
-import stateReference from './state-reference';
-
-it('should build a state reference', () => {
-  const built = stateReference().build<TReference<'state'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'state',
-  });
-});
diff --git a/models/commons/src/reference/presets/state/state-reference.ts b/models/commons/src/reference/presets/state/state-reference.ts
deleted file mode 100644
index 11bb0fa4f..000000000
--- a/models/commons/src/reference/presets/state/state-reference.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const stateReference = (): TReferenceBuilder => Reference().typeId('state');
-
-export default stateReference;
diff --git a/models/commons/src/reference/presets/store-reference.ts b/models/commons/src/reference/presets/store-reference.ts
new file mode 100644
index 000000000..357d77535
--- /dev/null
+++ b/models/commons/src/reference/presets/store-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.store);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/store/index.ts b/models/commons/src/reference/presets/store/index.ts
deleted file mode 100644
index 12bb38f86..000000000
--- a/models/commons/src/reference/presets/store/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './store-reference';
diff --git a/models/commons/src/reference/presets/store/store-reference.spec.ts b/models/commons/src/reference/presets/store/store-reference.spec.ts
deleted file mode 100644
index 4f9371921..000000000
--- a/models/commons/src/reference/presets/store/store-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReference } from '../../types';
-import storeReference from './store-reference';
-
-it('should build a store reference', () => {
-  const built = storeReference().build<TReference<'store'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'store',
-  });
-});
diff --git a/models/commons/src/reference/presets/store/store-reference.ts b/models/commons/src/reference/presets/store/store-reference.ts
deleted file mode 100644
index 49d12b1a2..000000000
--- a/models/commons/src/reference/presets/store/store-reference.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const storeReference = (): TReferenceBuilder => Reference().typeId('store');
-
-export default storeReference;
diff --git a/models/commons/src/reference/presets/subscription-reference.ts b/models/commons/src/reference/presets/subscription-reference.ts
new file mode 100644
index 000000000..e3f62f0a1
--- /dev/null
+++ b/models/commons/src/reference/presets/subscription-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.subscription);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/subscription/index.ts b/models/commons/src/reference/presets/subscription/index.ts
deleted file mode 100644
index 512cf1f49..000000000
--- a/models/commons/src/reference/presets/subscription/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './subscription-reference';
diff --git a/models/commons/src/reference/presets/subscription/subscription-reference.spec.ts b/models/commons/src/reference/presets/subscription/subscription-reference.spec.ts
deleted file mode 100644
index 1b05fb094..000000000
--- a/models/commons/src/reference/presets/subscription/subscription-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReference } from '../../types';
-import subscriptionReference from './subscription-reference';
-
-it('should build a subscription reference', () => {
-  const built = subscriptionReference().build<TReference<'subscription'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'subscription',
-  });
-});
diff --git a/models/commons/src/reference/presets/subscription/subscription-reference.ts b/models/commons/src/reference/presets/subscription/subscription-reference.ts
deleted file mode 100644
index add449506..000000000
--- a/models/commons/src/reference/presets/subscription/subscription-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const subscriptionReference = (): TReferenceBuilder =>
-  Reference().typeId('subscription');
-
-export default subscriptionReference;
diff --git a/models/commons/src/reference/presets/tax-category-reference.ts b/models/commons/src/reference/presets/tax-category-reference.ts
new file mode 100644
index 000000000..9d8130537
--- /dev/null
+++ b/models/commons/src/reference/presets/tax-category-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.taxCategory);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/tax-category/index.ts b/models/commons/src/reference/presets/tax-category/index.ts
deleted file mode 100644
index 574ea5fe6..000000000
--- a/models/commons/src/reference/presets/tax-category/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './tax-category-reference';
diff --git a/models/commons/src/reference/presets/tax-category/tax-category-reference.spec.ts b/models/commons/src/reference/presets/tax-category/tax-category-reference.spec.ts
deleted file mode 100644
index f5561deb0..000000000
--- a/models/commons/src/reference/presets/tax-category/tax-category-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReference } from '../../types';
-import taxCategoryReference from './tax-category-reference';
-
-it('should build a tax-category reference', () => {
-  const built = taxCategoryReference().build<TReference<'tax-category'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'tax-category',
-  });
-});
diff --git a/models/commons/src/reference/presets/tax-category/tax-category-reference.ts b/models/commons/src/reference/presets/tax-category/tax-category-reference.ts
deleted file mode 100644
index 9015389e3..000000000
--- a/models/commons/src/reference/presets/tax-category/tax-category-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const taxCategoryReference = (): TReferenceBuilder =>
-  Reference().typeId('tax-category');
-
-export default taxCategoryReference;
diff --git a/models/commons/src/reference/presets/type-reference.ts b/models/commons/src/reference/presets/type-reference.ts
new file mode 100644
index 000000000..f03c20b04
--- /dev/null
+++ b/models/commons/src/reference/presets/type-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.type);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/type/index.ts b/models/commons/src/reference/presets/type/index.ts
deleted file mode 100644
index 59edd62fd..000000000
--- a/models/commons/src/reference/presets/type/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './type-reference';
diff --git a/models/commons/src/reference/presets/type/type-reference.spec.ts b/models/commons/src/reference/presets/type/type-reference.spec.ts
deleted file mode 100644
index e12d3cc55..000000000
--- a/models/commons/src/reference/presets/type/type-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReference } from '../../types';
-import typeReference from './type-reference';
-
-it('should build a type reference', () => {
-  const built = typeReference().build<TReference<'type'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'type',
-  });
-});
diff --git a/models/commons/src/reference/presets/type/type-reference.ts b/models/commons/src/reference/presets/type/type-reference.ts
deleted file mode 100644
index c0a53f8f0..000000000
--- a/models/commons/src/reference/presets/type/type-reference.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const typeReference = (): TReferenceBuilder => Reference().typeId('type');
-
-export default typeReference;
diff --git a/models/commons/src/reference/presets/zone-reference.ts b/models/commons/src/reference/presets/zone-reference.ts
new file mode 100644
index 000000000..972c063d3
--- /dev/null
+++ b/models/commons/src/reference/presets/zone-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../constants';
+import { buildReferencePresets } from './_shared/reference-presets-builder';
+
+const presets = buildReferencePresets(referenceTypes.zone);
+
+export default presets;
diff --git a/models/commons/src/reference/presets/zone/index.ts b/models/commons/src/reference/presets/zone/index.ts
deleted file mode 100644
index 8d4c1c68c..000000000
--- a/models/commons/src/reference/presets/zone/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './zone-reference';
diff --git a/models/commons/src/reference/presets/zone/zone-reference.spec.ts b/models/commons/src/reference/presets/zone/zone-reference.spec.ts
deleted file mode 100644
index 17880d7a7..000000000
--- a/models/commons/src/reference/presets/zone/zone-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReference } from '../../types';
-import zoneReference from './zone-reference';
-
-it('should build a zone reference', () => {
-  const built = zoneReference().build<TReference<'zone'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'zone',
-  });
-});
diff --git a/models/commons/src/reference/presets/zone/zone-reference.ts b/models/commons/src/reference/presets/zone/zone-reference.ts
deleted file mode 100644
index 95075b43a..000000000
--- a/models/commons/src/reference/presets/zone/zone-reference.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import Reference from '../../builder';
-import type { TReferenceBuilder } from '../../types';
-
-const zoneReference = (): TReferenceBuilder => Reference().typeId('zone');
-
-export default zoneReference;
diff --git a/models/commons/src/reference/reference-draft/builder.spec.ts b/models/commons/src/reference/reference-draft/builder.spec.ts
deleted file mode 100644
index ebc6eaa56..000000000
--- a/models/commons/src/reference/reference-draft/builder.spec.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/* eslint-disable jest/no-disabled-tests */
-/* eslint-disable jest/valid-title */
-import { createBuilderSpec } from '@commercetools-test-data/core/test-utils';
-import type {
-  TReferenceDraft,
-  TReferenceDraftGraphql,
-  TReferenceRest,
-} from '../types';
-import * as Reference from './index';
-
-describe('builder', () => {
-  it(
-    ...createBuilderSpec<TReferenceDraft, TReferenceDraft>(
-      'default',
-      Reference.random(),
-      {
-        id: expect.any(String),
-        typeId: null,
-      }
-    )
-  );
-  it(
-    ...createBuilderSpec<TReferenceDraft, TReferenceRest>(
-      'rest',
-      Reference.random().typeId('product'),
-      {
-        id: expect.any(String),
-        typeId: 'product',
-        obj: {
-          id: expect.any(String),
-        },
-      }
-    )
-  );
-  it(
-    ...createBuilderSpec<TReferenceDraft, TReferenceDraftGraphql>(
-      'graphql',
-      Reference.random().typeId('product'),
-      {
-        id: expect.any(String),
-        typeId: 'product',
-      }
-    )
-  );
-});
diff --git a/models/commons/src/reference/reference-draft/builder.ts b/models/commons/src/reference/reference-draft/builder.ts
deleted file mode 100644
index 4ec344300..000000000
--- a/models/commons/src/reference/reference-draft/builder.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Builder } from '@commercetools-test-data/core';
-import type { TCreateReferenceDraftBuilder, TReferenceDraft } from '../types';
-import generator from './generator';
-import transformers from './transformers';
-
-const Model: TCreateReferenceDraftBuilder = () =>
-  Builder<TReferenceDraft>({
-    name: 'ReferenceDraft',
-    generator,
-    transformers,
-  });
-
-export default Model;
diff --git a/models/commons/src/reference/reference-draft/builders.spec.ts b/models/commons/src/reference/reference-draft/builders.spec.ts
new file mode 100644
index 000000000..a09cafc04
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/builders.spec.ts
@@ -0,0 +1,94 @@
+import type { TReferenceDraftRest, TReferenceGraphql } from '../types';
+import {
+  ReferenceDraft,
+  ReferenceDraftGraphql,
+  ReferenceDraftRest,
+} from './index';
+
+const validateModel = (
+  model: TReferenceGraphql | TReferenceDraftRest,
+  options?: {
+    id?: string | null;
+    typeId?: string | null;
+  }
+) => {
+  expect(model).toEqual(
+    expect.objectContaining({
+      id: options?.id || expect.any(String),
+      typeId: options?.typeId || null,
+    })
+  );
+};
+
+describe('Channel model builders', () => {
+  it('builds a REST model', () => {
+    const restModel = ReferenceDraftRest.random().build();
+    validateModel(restModel);
+  });
+
+  it('builds a populated REST model', () => {
+    const restModel = ReferenceDraftRest.random()
+      .id('12345')
+      .typeId('foo')
+      .build();
+
+    validateModel(restModel, {
+      id: '12345',
+      typeId: 'foo',
+    });
+  });
+
+  it('builds a GraphQL model', () => {
+    const graphqlModel = ReferenceDraftGraphql.random().build();
+
+    validateModel(graphqlModel);
+  });
+
+  it('builds a populated GraphQL model', () => {
+    const graphqlModel = ReferenceDraftGraphql.random()
+      .id('12345')
+      .typeId('foo')
+      .build();
+
+    validateModel(graphqlModel, {
+      id: '12345',
+      typeId: 'foo',
+    });
+  });
+});
+
+describe('Channel model compatibility builders', () => {
+  it('builds a REST model', () => {
+    const restModel = ReferenceDraft.random().buildRest();
+    validateModel(restModel);
+  });
+
+  it('builds a populated REST model', () => {
+    const restModel = ReferenceDraft.random()
+      .id('12345')
+      .typeId('foo')
+      .buildRest();
+
+    validateModel(restModel, {
+      id: '12345',
+      typeId: 'foo',
+    });
+  });
+
+  it('builds a GraphQL model', () => {
+    const graphqlModel = ReferenceDraft.random().buildGraphql();
+    validateModel(graphqlModel);
+  });
+
+  it('builds a populated GraphQL model', () => {
+    const graphqlModel = ReferenceDraft.random()
+      .id('12345')
+      .typeId('foo')
+      .buildGraphql();
+
+    validateModel(graphqlModel, {
+      id: '12345',
+      typeId: 'foo',
+    });
+  });
+});
diff --git a/models/commons/src/reference/reference-draft/builders.ts b/models/commons/src/reference/reference-draft/builders.ts
new file mode 100644
index 000000000..91a75b94c
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/builders.ts
@@ -0,0 +1,42 @@
+import {
+  createCompatibilityBuilder,
+  createSpecializedBuilder,
+  TModelFieldsConfig,
+} from '@commercetools-test-data/core';
+import type {
+  TReferenceDraftRest,
+  TReferenceDraftGraphql,
+  TCreateReferenceBuilder,
+} from '../types';
+import { restFieldsConfig, graphqlFieldsConfig } from './fields-config';
+
+export const RestModelBuilder: TCreateReferenceBuilder<
+  TReferenceDraftRest
+> = () =>
+  createSpecializedBuilder({
+    name: 'ReferenceDraftRestBuilder',
+    type: 'rest',
+    modelFieldsConfig: restFieldsConfig,
+  });
+
+export const GraphqlModelBuilder: TCreateReferenceBuilder<
+  TReferenceDraftGraphql
+> = () =>
+  createSpecializedBuilder({
+    name: 'ReferenceDraftGraphqlBuilder',
+    type: 'graphql',
+    modelFieldsConfig: graphqlFieldsConfig,
+  });
+
+export const CompatModelBuilder = <
+  TReferenceModel extends
+    | TReferenceDraftRest
+    | TReferenceDraftGraphql = TReferenceDraftRest,
+>() =>
+  createCompatibilityBuilder<TReferenceModel>({
+    name: 'ReferenceDraftCompatBuilder',
+    modelFieldsConfig: {
+      rest: restFieldsConfig as TModelFieldsConfig<TReferenceModel>,
+      graphql: graphqlFieldsConfig as TModelFieldsConfig<TReferenceModel>,
+    },
+  });
diff --git a/models/commons/src/reference/reference-draft/fields-config.ts b/models/commons/src/reference/reference-draft/fields-config.ts
new file mode 100644
index 000000000..6c2c7079f
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/fields-config.ts
@@ -0,0 +1,21 @@
+import { type TModelFieldsConfig, fake } from '@commercetools-test-data/core';
+import type { TReferenceDraftGraphql, TReferenceDraftRest } from '../types';
+
+const commonFieldsConfig = {
+  fields: {
+    id: fake((f) => f.string.uuid()),
+    typeId: null,
+  },
+};
+
+export const restFieldsConfig: TModelFieldsConfig<TReferenceDraftRest> = {
+  fields: {
+    ...commonFieldsConfig.fields,
+  },
+};
+
+export const graphqlFieldsConfig: TModelFieldsConfig<TReferenceDraftGraphql> = {
+  fields: {
+    ...commonFieldsConfig.fields,
+  },
+};
diff --git a/models/commons/src/reference/reference-draft/generator.ts b/models/commons/src/reference/reference-draft/generator.ts
deleted file mode 100644
index 0b4b0ae9a..000000000
--- a/models/commons/src/reference/reference-draft/generator.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Generator, fake } from '@commercetools-test-data/core';
-import type { TReferenceDraft } from '../types';
-
-// https://docs.commercetools.com/api/types#referencetype
-const generator = Generator<TReferenceDraft>({
-  fields: {
-    id: fake((f) => f.string.uuid()),
-    typeId: null,
-  },
-});
-
-export default generator;
diff --git a/models/commons/src/reference/reference-draft/index.ts b/models/commons/src/reference/reference-draft/index.ts
index 96e2519e1..f84427394 100644
--- a/models/commons/src/reference/reference-draft/index.ts
+++ b/models/commons/src/reference/reference-draft/index.ts
@@ -1,2 +1,24 @@
-export { default as random } from './builder';
-export { default as presets } from './presets';
+import {
+  RestModelBuilder,
+  GraphqlModelBuilder,
+  CompatModelBuilder,
+} from './builders';
+import * as modelPresets from './presets';
+
+export const ReferenceDraftRest = {
+  random: RestModelBuilder,
+  presets: modelPresets.restPresets,
+};
+
+export const ReferenceDraftGraphql = {
+  random: GraphqlModelBuilder,
+  presets: modelPresets.graphqlPresets,
+};
+
+/**
+ * @deprecated Use `ReferenceDraftRest` or `ReferenceDraftGraphql` exported models instead of `ReferenceDraft`.
+ */
+export const ReferenceDraft = {
+  random: CompatModelBuilder,
+  presets: modelPresets.compatPresets,
+};
diff --git a/models/commons/src/reference/reference-draft/presets/_shared/reference-draft-presets-builder.spec.ts b/models/commons/src/reference/reference-draft/presets/_shared/reference-draft-presets-builder.spec.ts
new file mode 100644
index 000000000..1698f2cc4
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/_shared/reference-draft-presets-builder.spec.ts
@@ -0,0 +1,45 @@
+import { buildReferenceDraftPresets } from './reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets('associate-role');
+
+describe('AssociateRoleReference preset', () => {
+  it('should build a REST model', () => {
+    const restModel = presets.restPreset().build();
+    expect(restModel).toEqual({
+      id: expect.any(String),
+      typeId: 'associate-role',
+    });
+  });
+
+  it('should build a GraphQL model', () => {
+    const graphqlModel = presets.graphqlPreset().build();
+    expect(graphqlModel).toEqual({
+      id: expect.any(String),
+      typeId: 'associate-role',
+    });
+  });
+
+  it('should build a compatibility model', () => {
+    const compatModel = presets.compatPreset().build();
+    expect(compatModel).toEqual({
+      id: expect.any(String),
+      typeId: 'associate-role',
+    });
+  });
+
+  it('should build a compatibility REST model', () => {
+    const compatModel = presets.compatPreset().buildRest();
+    expect(compatModel).toEqual({
+      id: expect.any(String),
+      typeId: 'associate-role',
+    });
+  });
+
+  it('should build a compatibility GraphQL model', () => {
+    const compatModel = presets.compatPreset().buildGraphql();
+    expect(compatModel).toEqual({
+      id: expect.any(String),
+      typeId: 'associate-role',
+    });
+  });
+});
diff --git a/models/commons/src/reference/reference-draft/presets/_shared/reference-draft-presets-builder.ts b/models/commons/src/reference/reference-draft/presets/_shared/reference-draft-presets-builder.ts
new file mode 100644
index 000000000..d072a3cab
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/_shared/reference-draft-presets-builder.ts
@@ -0,0 +1,22 @@
+import { TBuilder } from '@commercetools-test-data/core';
+import {
+  TReferenceDraft,
+  TReferenceDraftGraphql,
+  TReferenceDraftRest,
+} from '../../../types';
+import {
+  ReferenceDraft,
+  ReferenceDraftGraphql,
+  ReferenceDraftRest,
+} from '../../index';
+
+export function buildReferenceDraftPresets(typeId: string) {
+  return {
+    restPreset: (): TBuilder<TReferenceDraftRest> =>
+      ReferenceDraftRest.random().typeId(typeId),
+    graphqlPreset: (): TBuilder<TReferenceDraftGraphql> =>
+      ReferenceDraftGraphql.random().typeId(typeId),
+    compatPreset: (): TBuilder<TReferenceDraft> =>
+      ReferenceDraft.random().typeId(typeId),
+  };
+}
diff --git a/models/commons/src/reference/reference-draft/presets/associate-role-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/associate-role-draft-reference.ts
new file mode 100644
index 000000000..f69469e83
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/associate-role-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.associateRole);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/associate-role/associate-role-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/associate-role/associate-role-reference.spec.ts
deleted file mode 100644
index 4ace967f0..000000000
--- a/models/commons/src/reference/reference-draft/presets/associate-role/associate-role-reference.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import associateRoleReference from './associate-role-reference';
-
-it('should build an associate-role reference', () => {
-  const built =
-    associateRoleReference().build<TReferenceDraft<'associate-role'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'associate-role',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/associate-role/associate-role-reference.ts b/models/commons/src/reference/reference-draft/presets/associate-role/associate-role-reference.ts
deleted file mode 100644
index 25d478966..000000000
--- a/models/commons/src/reference/reference-draft/presets/associate-role/associate-role-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const associateRoleReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('associate-role');
-
-export default associateRoleReference;
diff --git a/models/commons/src/reference/reference-draft/presets/associate-role/index.ts b/models/commons/src/reference/reference-draft/presets/associate-role/index.ts
deleted file mode 100644
index 97e12dfcc..000000000
--- a/models/commons/src/reference/reference-draft/presets/associate-role/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './associate-role-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/attribute-group-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/attribute-group-draft-reference.ts
new file mode 100644
index 000000000..91d9ff970
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/attribute-group-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.attributeGroup);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/attribute-group/attribute-group-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/attribute-group/attribute-group-reference.spec.ts
deleted file mode 100644
index 2f2cba34b..000000000
--- a/models/commons/src/reference/reference-draft/presets/attribute-group/attribute-group-reference.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import attributeGroupReference from './attribute-group-reference';
-
-it('should build an attribute-group reference', () => {
-  const built =
-    attributeGroupReference().build<TReferenceDraft<'attribute-group'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'attribute-group',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/attribute-group/attribute-group-reference.ts b/models/commons/src/reference/reference-draft/presets/attribute-group/attribute-group-reference.ts
deleted file mode 100644
index 5c2fe4152..000000000
--- a/models/commons/src/reference/reference-draft/presets/attribute-group/attribute-group-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const attributeGroupReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('attribute-group');
-
-export default attributeGroupReference;
diff --git a/models/commons/src/reference/reference-draft/presets/attribute-group/index.ts b/models/commons/src/reference/reference-draft/presets/attribute-group/index.ts
deleted file mode 100644
index 61f6304e7..000000000
--- a/models/commons/src/reference/reference-draft/presets/attribute-group/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './attribute-group-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/business-unit-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/business-unit-draft-reference.ts
new file mode 100644
index 000000000..abc80bed1
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/business-unit-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.businessUnit);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/business-unit/business-unit-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/business-unit/business-unit-reference.spec.ts
deleted file mode 100644
index 3136296d3..000000000
--- a/models/commons/src/reference/reference-draft/presets/business-unit/business-unit-reference.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import businessUnitReference from './business-unit-reference';
-
-it('should build an business-unit reference', () => {
-  const built =
-    businessUnitReference().build<TReferenceDraft<'business-unit'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'business-unit',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/business-unit/business-unit-reference.ts b/models/commons/src/reference/reference-draft/presets/business-unit/business-unit-reference.ts
deleted file mode 100644
index 92ba8691a..000000000
--- a/models/commons/src/reference/reference-draft/presets/business-unit/business-unit-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const businessUnitReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('business-unit');
-
-export default businessUnitReference;
diff --git a/models/commons/src/reference/reference-draft/presets/business-unit/index.ts b/models/commons/src/reference/reference-draft/presets/business-unit/index.ts
deleted file mode 100644
index ec2057b3e..000000000
--- a/models/commons/src/reference/reference-draft/presets/business-unit/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './business-unit-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/cart-discount-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/cart-discount-draft-reference.ts
new file mode 100644
index 000000000..5e39fda3a
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/cart-discount-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.cartDiscount);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/cart-discount/cart-discount-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/cart-discount/cart-discount-reference.spec.ts
deleted file mode 100644
index 543c38954..000000000
--- a/models/commons/src/reference/reference-draft/presets/cart-discount/cart-discount-reference.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import cartDiscountReference from './cart-discount-reference';
-
-it('should build a cart-discount reference', () => {
-  const built =
-    cartDiscountReference().build<TReferenceDraft<'cart-discount'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'cart-discount',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/cart-discount/cart-discount-reference.ts b/models/commons/src/reference/reference-draft/presets/cart-discount/cart-discount-reference.ts
deleted file mode 100644
index e1abb16dd..000000000
--- a/models/commons/src/reference/reference-draft/presets/cart-discount/cart-discount-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const cartDiscountReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('cart-discount');
-
-export default cartDiscountReference;
diff --git a/models/commons/src/reference/reference-draft/presets/cart-discount/index.ts b/models/commons/src/reference/reference-draft/presets/cart-discount/index.ts
deleted file mode 100644
index b00da4f62..000000000
--- a/models/commons/src/reference/reference-draft/presets/cart-discount/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './cart-discount-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/cart-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/cart-draft-reference.ts
new file mode 100644
index 000000000..c166d0076
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/cart-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.cart);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/cart/cart-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/cart/cart-reference.spec.ts
deleted file mode 100644
index e11f7ccbf..000000000
--- a/models/commons/src/reference/reference-draft/presets/cart/cart-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import cartReference from './cart-reference';
-
-it('should build a cart reference', () => {
-  const built = cartReference().build<TReferenceDraft<'cart'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'cart',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/cart/cart-reference.ts b/models/commons/src/reference/reference-draft/presets/cart/cart-reference.ts
deleted file mode 100644
index ff7169b55..000000000
--- a/models/commons/src/reference/reference-draft/presets/cart/cart-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const cartReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('cart');
-
-export default cartReference;
diff --git a/models/commons/src/reference/reference-draft/presets/cart/index.ts b/models/commons/src/reference/reference-draft/presets/cart/index.ts
deleted file mode 100644
index 33c82f8fd..000000000
--- a/models/commons/src/reference/reference-draft/presets/cart/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './cart-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/category-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/category-draft-reference.ts
new file mode 100644
index 000000000..84a31558a
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/category-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.category);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/category/category-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/category/category-reference.spec.ts
deleted file mode 100644
index 65b022b20..000000000
--- a/models/commons/src/reference/reference-draft/presets/category/category-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import categoryReference from './category-reference';
-
-it('should build a category reference', () => {
-  const built = categoryReference().build<TReferenceDraft<'category'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'category',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/category/category-reference.ts b/models/commons/src/reference/reference-draft/presets/category/category-reference.ts
deleted file mode 100644
index e1560add5..000000000
--- a/models/commons/src/reference/reference-draft/presets/category/category-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const categoryReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('category');
-
-export default categoryReference;
diff --git a/models/commons/src/reference/reference-draft/presets/category/index.ts b/models/commons/src/reference/reference-draft/presets/category/index.ts
deleted file mode 100644
index ee3689866..000000000
--- a/models/commons/src/reference/reference-draft/presets/category/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './category-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/channel-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/channel-draft-reference.ts
new file mode 100644
index 000000000..2daeeb6a4
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/channel-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.channel);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/channel/channel-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/channel/channel-reference.spec.ts
deleted file mode 100644
index 75c2f8193..000000000
--- a/models/commons/src/reference/reference-draft/presets/channel/channel-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import channelReference from './channel-reference';
-
-it('should build a channel reference', () => {
-  const built = channelReference().build<TReferenceDraft<'channel'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'channel',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/channel/channel-reference.ts b/models/commons/src/reference/reference-draft/presets/channel/channel-reference.ts
deleted file mode 100644
index a8f937f3b..000000000
--- a/models/commons/src/reference/reference-draft/presets/channel/channel-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const channelReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('channel');
-
-export default channelReference;
diff --git a/models/commons/src/reference/reference-draft/presets/channel/index.ts b/models/commons/src/reference/reference-draft/presets/channel/index.ts
deleted file mode 100644
index cf4c1fcfa..000000000
--- a/models/commons/src/reference/reference-draft/presets/channel/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './channel-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/customer-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/customer-draft-reference.ts
new file mode 100644
index 000000000..52ef4fa93
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/customer-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.customer);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/customer-group-draft-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/customer-group-draft-draft-reference.ts
new file mode 100644
index 000000000..d4d57fe15
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/customer-group-draft-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.customerGroup);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/customer-group/customer-group-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/customer-group/customer-group-reference.spec.ts
deleted file mode 100644
index d7f1c7df1..000000000
--- a/models/commons/src/reference/reference-draft/presets/customer-group/customer-group-reference.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import customerGroupReference from './customer-group-reference';
-
-it('should build a customer-group reference', () => {
-  const built =
-    customerGroupReference().build<TReferenceDraft<'customer-group'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'customer-group',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/customer-group/customer-group-reference.ts b/models/commons/src/reference/reference-draft/presets/customer-group/customer-group-reference.ts
deleted file mode 100644
index 32e05d442..000000000
--- a/models/commons/src/reference/reference-draft/presets/customer-group/customer-group-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const customerGroupReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('customer-group');
-
-export default customerGroupReference;
diff --git a/models/commons/src/reference/reference-draft/presets/customer-group/index.ts b/models/commons/src/reference/reference-draft/presets/customer-group/index.ts
deleted file mode 100644
index 5af188510..000000000
--- a/models/commons/src/reference/reference-draft/presets/customer-group/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './customer-group-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/customer/customer-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/customer/customer-reference.spec.ts
deleted file mode 100644
index 7ecf803a7..000000000
--- a/models/commons/src/reference/reference-draft/presets/customer/customer-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import customerReference from './customer-reference';
-
-it('should build a customer reference', () => {
-  const built = customerReference().build<TReferenceDraft<'customer'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'customer',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/customer/customer-reference.ts b/models/commons/src/reference/reference-draft/presets/customer/customer-reference.ts
deleted file mode 100644
index c1f4ce4d7..000000000
--- a/models/commons/src/reference/reference-draft/presets/customer/customer-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const customerReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('customer');
-
-export default customerReference;
diff --git a/models/commons/src/reference/reference-draft/presets/customer/index.ts b/models/commons/src/reference/reference-draft/presets/customer/index.ts
deleted file mode 100644
index 49e7038ac..000000000
--- a/models/commons/src/reference/reference-draft/presets/customer/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './customer-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/direct-discount-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/direct-discount-draft-reference.ts
new file mode 100644
index 000000000..a0b39a2c9
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/direct-discount-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.directDiscount);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/direct-discount/direct-discount-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/direct-discount/direct-discount-reference.spec.ts
deleted file mode 100644
index 36cee60f8..000000000
--- a/models/commons/src/reference/reference-draft/presets/direct-discount/direct-discount-reference.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import directDiscountReference from './direct-discount-reference';
-
-it('should build a direct-discount reference', () => {
-  const built =
-    directDiscountReference().build<TReferenceDraft<'direct-discount'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'direct-discount',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/direct-discount/direct-discount-reference.ts b/models/commons/src/reference/reference-draft/presets/direct-discount/direct-discount-reference.ts
deleted file mode 100644
index 7290a1025..000000000
--- a/models/commons/src/reference/reference-draft/presets/direct-discount/direct-discount-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const directDiscountReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('direct-discount');
-
-export default directDiscountReference;
diff --git a/models/commons/src/reference/reference-draft/presets/direct-discount/index.ts b/models/commons/src/reference/reference-draft/presets/direct-discount/index.ts
deleted file mode 100644
index fbd349c53..000000000
--- a/models/commons/src/reference/reference-draft/presets/direct-discount/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './direct-discount-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/discount-code-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/discount-code-draft-reference.ts
new file mode 100644
index 000000000..9d13674cf
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/discount-code-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.discountCode);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/discount-code/discount-code-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/discount-code/discount-code-reference.spec.ts
deleted file mode 100644
index f0c56ae39..000000000
--- a/models/commons/src/reference/reference-draft/presets/discount-code/discount-code-reference.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import discountCodeReference from './discount-code-reference';
-
-it('should build a discount-code reference', () => {
-  const built =
-    discountCodeReference().build<TReferenceDraft<'discount-code'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'discount-code',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/discount-code/discount-code-reference.ts b/models/commons/src/reference/reference-draft/presets/discount-code/discount-code-reference.ts
deleted file mode 100644
index 2efa900e3..000000000
--- a/models/commons/src/reference/reference-draft/presets/discount-code/discount-code-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const discountCodeReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('discount-code');
-
-export default discountCodeReference;
diff --git a/models/commons/src/reference/reference-draft/presets/discount-code/index.ts b/models/commons/src/reference/reference-draft/presets/discount-code/index.ts
deleted file mode 100644
index a905bd66f..000000000
--- a/models/commons/src/reference/reference-draft/presets/discount-code/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './discount-code-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/extension-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/extension-draft-reference.ts
new file mode 100644
index 000000000..1e06f5a12
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/extension-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.extension);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/extension/extension-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/extension/extension-reference.spec.ts
deleted file mode 100644
index 55f5448af..000000000
--- a/models/commons/src/reference/reference-draft/presets/extension/extension-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import extensionReference from './extension-reference';
-
-it('should build an extension reference', () => {
-  const built = extensionReference().build<TReferenceDraft<'extension'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'extension',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/extension/extension-reference.ts b/models/commons/src/reference/reference-draft/presets/extension/extension-reference.ts
deleted file mode 100644
index d12c371c6..000000000
--- a/models/commons/src/reference/reference-draft/presets/extension/extension-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const extensionReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('extension');
-
-export default extensionReference;
diff --git a/models/commons/src/reference/reference-draft/presets/extension/index.ts b/models/commons/src/reference/reference-draft/presets/extension/index.ts
deleted file mode 100644
index 303769f35..000000000
--- a/models/commons/src/reference/reference-draft/presets/extension/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './extension-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/index.ts b/models/commons/src/reference/reference-draft/presets/index.ts
index 9b5a154ff..685733b16 100644
--- a/models/commons/src/reference/reference-draft/presets/index.ts
+++ b/models/commons/src/reference/reference-draft/presets/index.ts
@@ -1,75 +1,147 @@
-import associateRoleReference from './associate-role';
-import attributeGroupReference from './attribute-group';
-import businessUnitReference from './business-unit';
-import cartReference from './cart';
-import cartDiscountReference from './cart-discount';
-import categoryReference from './category';
-import channelReference from './channel';
-import customerReference from './customer';
-import customerGroupReference from './customer-group';
-import directDiscountReference from './direct-discount';
-import discountCodeReference from './discount-code';
-import extensionReference from './extension';
-import inventoryEntryReference from './inventory-entry';
-import keyValueDocumentReference from './key-value-document';
-import orderReference from './order';
-import orderEditReference from './order-edit';
-import paymentReference from './payment';
-import productReference from './product';
-import productDiscountReference from './product-discount';
-import productPriceReference from './product-price';
-import productSelectionReference from './product-selection';
-import productTypeReference from './product-type';
-import quoteReference from './quote';
-import quoteRequestReference from './quote-request';
-import reviewReference from './review';
-import shippingMethodReference from './shipping-method';
-import shoppingListReference from './shopping-list';
-import stagedQuoteReference from './staged-quote';
-import standalonePriceReference from './standalone-price';
-import stateReference from './state';
-import storeReference from './store';
-import subscriptionReference from './subscription';
-import taxCategoryReference from './tax-category';
-import typeReference from './type';
-import zoneReference from './zone';
+import associateRoleReference from './associate-role-draft-reference';
+import attributeGroupReference from './attribute-group-draft-reference';
+import businessUnitReference from './business-unit-draft-reference';
+import cartDiscountReference from './cart-discount-draft-reference';
+import cartReference from './cart-draft-reference';
+import categoryReference from './category-draft-reference';
+import channelReference from './channel-draft-reference';
+import customerReference from './customer-draft-reference';
+import customerGroupReference from './customer-group-draft-draft-reference';
+import directDiscountReference from './direct-discount-draft-reference';
+import discountCodeReference from './discount-code-draft-reference';
+import extensionReference from './extension-draft-reference';
+import inventoryEntryReference from './inventory-entry-draft-reference';
+import keyValueDocumentReference from './key-value-document-draft-reference';
+import orderReference from './order-draft-reference';
+import orderEditReference from './order-edit-draft-reference';
+import paymentReference from './payment-draft-reference';
+import productDiscountReference from './product-discount-draft-reference';
+import productReference from './product-draft-reference';
+import productPriceReference from './product-price-draft-reference';
+import productSelectionReference from './product-selection-draft-reference';
+import productTypeReference from './product-type-draft-reference';
+import quoteReference from './quote-draft-reference';
+import quoteRequestReference from './quote-request-draft-reference';
+import reviewReference from './review-draft-reference';
+import shippingMethodReference from './shipping-method-draft-reference';
+import shoppingListReference from './shopping-list-draft-reference';
+import stagedQuoteReference from './staged-quote-draft-reference';
+import standalonePriceReference from './standalone-price-draft-reference';
+import stateReference from './state-draft-reference';
+import storeReference from './store-draft-reference';
+import subscriptionReference from './subscription-draft-reference';
+import taxCategoryReference from './tax-category-draft-reference';
+import typeReference from './type-draft-reference';
+import zoneReference from './zone-draft-reference';
 
-const presets = {
-  associateRoleReference,
-  attributeGroupReference,
-  businessUnitReference,
-  cartDiscountReference,
-  cartReference,
-  categoryReference,
-  channelReference,
-  customerReference,
-  customerGroupReference,
-  directDiscountReference,
-  discountCodeReference,
-  extensionReference,
-  inventoryEntryReference,
-  keyValueDocumentReference,
-  orderReference,
-  orderEditReference,
-  paymentReference,
-  productReference,
-  productDiscountReference,
-  productPriceReference,
-  productSelectionReference,
-  productTypeReference,
-  quoteReference,
-  quoteRequestReference,
-  reviewReference,
-  shippingMethodReference,
-  shoppingListReference,
-  stagedQuoteReference,
-  standalonePriceReference,
-  stateReference,
-  storeReference,
-  subscriptionReference,
-  taxCategoryReference,
-  typeReference,
-  zoneReference,
+export const restPresets = {
+  associateRoleReference: associateRoleReference.restPreset,
+  attributeGroupReference: attributeGroupReference.restPreset,
+  businessUnitReference: businessUnitReference.restPreset,
+  cartDiscountReference: cartDiscountReference.restPreset,
+  cartReference: cartReference.restPreset,
+  categoryReference: categoryReference.restPreset,
+  channelReference: channelReference.restPreset,
+  customerReference: customerReference.restPreset,
+  customerGroupReference: customerGroupReference.restPreset,
+  directDiscountReference: directDiscountReference.restPreset,
+  discountCodeReference: discountCodeReference.restPreset,
+  extensionReference: extensionReference.restPreset,
+  inventoryEntryReference: inventoryEntryReference.restPreset,
+  keyValueDocumentReference: keyValueDocumentReference.restPreset,
+  orderReference: orderReference.restPreset,
+  orderEditReference: orderEditReference.restPreset,
+  paymentReference: paymentReference.restPreset,
+  productReference: productReference.restPreset,
+  productDiscountReference: productDiscountReference.restPreset,
+  productPriceReference: productPriceReference.restPreset,
+  productSelectionReference: productSelectionReference.restPreset,
+  productTypeReference: productTypeReference.restPreset,
+  quoteReference: quoteReference.restPreset,
+  quoteRequestReference: quoteRequestReference.restPreset,
+  reviewReference: reviewReference.restPreset,
+  shippingMethodReference: shippingMethodReference.restPreset,
+  shoppingListReference: shoppingListReference.restPreset,
+  stagedQuoteReference: stagedQuoteReference.restPreset,
+  standalonePriceReference: standalonePriceReference.restPreset,
+  stateReference: stateReference.restPreset,
+  storeReference: storeReference.restPreset,
+  subscriptionReference: subscriptionReference.restPreset,
+  taxCategoryReference: taxCategoryReference.restPreset,
+  typeReference: typeReference.restPreset,
+  zoneReference: zoneReference.restPreset,
+};
+export const graphqlPresets = {
+  associateRoleReference: associateRoleReference.graphqlPreset,
+  attributeGroupReference: attributeGroupReference.graphqlPreset,
+  businessUnitReference: businessUnitReference.graphqlPreset,
+  cartDiscountReference: cartDiscountReference.graphqlPreset,
+  cartReference: cartReference.graphqlPreset,
+  categoryReference: categoryReference.graphqlPreset,
+  channelReference: channelReference.graphqlPreset,
+  customerReference: customerReference.graphqlPreset,
+  customerGroupReference: customerGroupReference.graphqlPreset,
+  directDiscountReference: directDiscountReference.graphqlPreset,
+  discountCodeReference: discountCodeReference.graphqlPreset,
+  extensionReference: extensionReference.graphqlPreset,
+  inventoryEntryReference: inventoryEntryReference.graphqlPreset,
+  keyValueDocumentReference: keyValueDocumentReference.graphqlPreset,
+  orderReference: orderReference.graphqlPreset,
+  orderEditReference: orderEditReference.graphqlPreset,
+  paymentReference: paymentReference.graphqlPreset,
+  productReference: productReference.graphqlPreset,
+  productDiscountReference: productDiscountReference.graphqlPreset,
+  productPriceReference: productPriceReference.graphqlPreset,
+  productSelectionReference: productSelectionReference.graphqlPreset,
+  productTypeReference: productTypeReference.graphqlPreset,
+  quoteReference: quoteReference.graphqlPreset,
+  quoteRequestReference: quoteRequestReference.graphqlPreset,
+  reviewReference: reviewReference.graphqlPreset,
+  shippingMethodReference: shippingMethodReference.graphqlPreset,
+  shoppingListReference: shoppingListReference.graphqlPreset,
+  stagedQuoteReference: stagedQuoteReference.graphqlPreset,
+  standalonePriceReference: standalonePriceReference.graphqlPreset,
+  stateReference: stateReference.graphqlPreset,
+  storeReference: storeReference.graphqlPreset,
+  subscriptionReference: subscriptionReference.graphqlPreset,
+  taxCategoryReference: taxCategoryReference.graphqlPreset,
+  typeReference: typeReference.graphqlPreset,
+  zoneReference: zoneReference.graphqlPreset,
+};
+export const compatPresets = {
+  associateRoleReference: associateRoleReference.compatPreset,
+  attributeGroupReference: attributeGroupReference.compatPreset,
+  businessUnitReference: businessUnitReference.compatPreset,
+  cartDiscountReference: cartDiscountReference.compatPreset,
+  cartReference: cartReference.compatPreset,
+  categoryReference: categoryReference.compatPreset,
+  channelReference: channelReference.compatPreset,
+  customerReference: customerReference.compatPreset,
+  customerGroupReference: customerGroupReference.compatPreset,
+  directDiscountReference: directDiscountReference.compatPreset,
+  discountCodeReference: discountCodeReference.compatPreset,
+  extensionReference: extensionReference.compatPreset,
+  inventoryEntryReference: inventoryEntryReference.compatPreset,
+  keyValueDocumentReference: keyValueDocumentReference.compatPreset,
+  orderReference: orderReference.compatPreset,
+  orderEditReference: orderEditReference.compatPreset,
+  paymentReference: paymentReference.compatPreset,
+  productReference: productReference.compatPreset,
+  productDiscountReference: productDiscountReference.compatPreset,
+  productPriceReference: productPriceReference.compatPreset,
+  productSelectionReference: productSelectionReference.compatPreset,
+  productTypeReference: productTypeReference.compatPreset,
+  quoteReference: quoteReference.compatPreset,
+  quoteRequestReference: quoteRequestReference.compatPreset,
+  reviewReference: reviewReference.compatPreset,
+  shippingMethodReference: shippingMethodReference.compatPreset,
+  shoppingListReference: shoppingListReference.compatPreset,
+  stagedQuoteReference: stagedQuoteReference.compatPreset,
+  standalonePriceReference: standalonePriceReference.compatPreset,
+  stateReference: stateReference.compatPreset,
+  storeReference: storeReference.compatPreset,
+  subscriptionReference: subscriptionReference.compatPreset,
+  taxCategoryReference: taxCategoryReference.compatPreset,
+  typeReference: typeReference.compatPreset,
+  zoneReference: zoneReference.compatPreset,
 };
-
-export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/inventory-entry-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/inventory-entry-draft-reference.ts
new file mode 100644
index 000000000..22810e65d
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/inventory-entry-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.inventoryEntry);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/inventory-entry/index.ts b/models/commons/src/reference/reference-draft/presets/inventory-entry/index.ts
deleted file mode 100644
index 221089d70..000000000
--- a/models/commons/src/reference/reference-draft/presets/inventory-entry/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './inventory-entry-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/inventory-entry/inventory-entry-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/inventory-entry/inventory-entry-reference.spec.ts
deleted file mode 100644
index f5033dcde..000000000
--- a/models/commons/src/reference/reference-draft/presets/inventory-entry/inventory-entry-reference.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import inventoryEntryReference from './inventory-entry-reference';
-
-it('should build an inventory-entry reference', () => {
-  const built =
-    inventoryEntryReference().build<TReferenceDraft<'inventory-entry'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'inventory-entry',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/inventory-entry/inventory-entry-reference.ts b/models/commons/src/reference/reference-draft/presets/inventory-entry/inventory-entry-reference.ts
deleted file mode 100644
index da06909f7..000000000
--- a/models/commons/src/reference/reference-draft/presets/inventory-entry/inventory-entry-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const inventoryEntryReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('inventory-entry');
-
-export default inventoryEntryReference;
diff --git a/models/commons/src/reference/reference-draft/presets/key-value-document-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/key-value-document-draft-reference.ts
new file mode 100644
index 000000000..ed0289eb5
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/key-value-document-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.keyValueDocument);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/key-value-document/index.ts b/models/commons/src/reference/reference-draft/presets/key-value-document/index.ts
deleted file mode 100644
index 77f9d3c45..000000000
--- a/models/commons/src/reference/reference-draft/presets/key-value-document/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './key-value-document-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/key-value-document/key-value-document-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/key-value-document/key-value-document-reference.spec.ts
deleted file mode 100644
index fe629bb2c..000000000
--- a/models/commons/src/reference/reference-draft/presets/key-value-document/key-value-document-reference.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import keyValueDocumentReference from './key-value-document-reference';
-
-it('should build a key-value-document reference', () => {
-  const built =
-    keyValueDocumentReference().build<TReferenceDraft<'key-value-document'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'key-value-document',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/key-value-document/key-value-document-reference.ts b/models/commons/src/reference/reference-draft/presets/key-value-document/key-value-document-reference.ts
deleted file mode 100644
index 625de6918..000000000
--- a/models/commons/src/reference/reference-draft/presets/key-value-document/key-value-document-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const keyValueDocumentReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('key-value-document');
-
-export default keyValueDocumentReference;
diff --git a/models/commons/src/reference/reference-draft/presets/order-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/order-draft-reference.ts
new file mode 100644
index 000000000..720d07703
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/order-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.order);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/order-edit-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/order-edit-draft-reference.ts
new file mode 100644
index 000000000..d7ae71bbd
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/order-edit-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.orderEdit);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/order-edit/index.ts b/models/commons/src/reference/reference-draft/presets/order-edit/index.ts
deleted file mode 100644
index 5c2eff527..000000000
--- a/models/commons/src/reference/reference-draft/presets/order-edit/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './order-edit-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/order-edit/order-edit-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/order-edit/order-edit-reference.spec.ts
deleted file mode 100644
index 2b179c393..000000000
--- a/models/commons/src/reference/reference-draft/presets/order-edit/order-edit-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import orderEditReference from './order-edit-reference';
-
-it('should build an order-edit reference', () => {
-  const built = orderEditReference().build<TReferenceDraft<'order-edit'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'order-edit',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/order-edit/order-edit-reference.ts b/models/commons/src/reference/reference-draft/presets/order-edit/order-edit-reference.ts
deleted file mode 100644
index ac7daec02..000000000
--- a/models/commons/src/reference/reference-draft/presets/order-edit/order-edit-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const orderEditReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('order-edit');
-
-export default orderEditReference;
diff --git a/models/commons/src/reference/reference-draft/presets/order/index.ts b/models/commons/src/reference/reference-draft/presets/order/index.ts
deleted file mode 100644
index 8e7cef222..000000000
--- a/models/commons/src/reference/reference-draft/presets/order/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './order-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/order/order-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/order/order-reference.spec.ts
deleted file mode 100644
index f19a7274d..000000000
--- a/models/commons/src/reference/reference-draft/presets/order/order-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import orderReference from './order-reference';
-
-it('should build an order reference', () => {
-  const built = orderReference().build<TReferenceDraft<'order'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'order',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/order/order-reference.ts b/models/commons/src/reference/reference-draft/presets/order/order-reference.ts
deleted file mode 100644
index 33541d462..000000000
--- a/models/commons/src/reference/reference-draft/presets/order/order-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const orderReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('order');
-
-export default orderReference;
diff --git a/models/commons/src/reference/reference-draft/presets/payment-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/payment-draft-reference.ts
new file mode 100644
index 000000000..a0c83de12
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/payment-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.payment);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/payment/index.ts b/models/commons/src/reference/reference-draft/presets/payment/index.ts
deleted file mode 100644
index fe1455935..000000000
--- a/models/commons/src/reference/reference-draft/presets/payment/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './payment-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/payment/payment-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/payment/payment-reference.spec.ts
deleted file mode 100644
index 183f413ac..000000000
--- a/models/commons/src/reference/reference-draft/presets/payment/payment-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import paymentReference from './payment-reference';
-
-it('should build a payment reference', () => {
-  const built = paymentReference().build<TReferenceDraft<'payment'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'payment',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/payment/payment-reference.ts b/models/commons/src/reference/reference-draft/presets/payment/payment-reference.ts
deleted file mode 100644
index 790e55aa9..000000000
--- a/models/commons/src/reference/reference-draft/presets/payment/payment-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const paymentReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('payment');
-
-export default paymentReference;
diff --git a/models/commons/src/reference/reference-draft/presets/product-discount-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/product-discount-draft-reference.ts
new file mode 100644
index 000000000..6f5abb3b2
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/product-discount-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.productDiscount);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/product-discount/index.ts b/models/commons/src/reference/reference-draft/presets/product-discount/index.ts
deleted file mode 100644
index b11855524..000000000
--- a/models/commons/src/reference/reference-draft/presets/product-discount/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './product-discount-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/product-discount/product-discount-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/product-discount/product-discount-reference.spec.ts
deleted file mode 100644
index c7bdf1368..000000000
--- a/models/commons/src/reference/reference-draft/presets/product-discount/product-discount-reference.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import productDiscountReference from './product-discount-reference';
-
-it('should build a product-discount reference', () => {
-  const built =
-    productDiscountReference().build<TReferenceDraft<'product-discount'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'product-discount',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/product-discount/product-discount-reference.ts b/models/commons/src/reference/reference-draft/presets/product-discount/product-discount-reference.ts
deleted file mode 100644
index e08fd74ff..000000000
--- a/models/commons/src/reference/reference-draft/presets/product-discount/product-discount-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const productDiscountReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('product-discount');
-
-export default productDiscountReference;
diff --git a/models/commons/src/reference/reference-draft/presets/product-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/product-draft-reference.ts
new file mode 100644
index 000000000..dbdfaaa2c
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/product-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.product);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/product-price-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/product-price-draft-reference.ts
new file mode 100644
index 000000000..18a9dca66
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/product-price-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.productPrice);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/product-price/index.ts b/models/commons/src/reference/reference-draft/presets/product-price/index.ts
deleted file mode 100644
index 0bd353098..000000000
--- a/models/commons/src/reference/reference-draft/presets/product-price/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './product-price-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/product-price/product-price-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/product-price/product-price-reference.spec.ts
deleted file mode 100644
index 39be2ab89..000000000
--- a/models/commons/src/reference/reference-draft/presets/product-price/product-price-reference.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import productPriceReference from './product-price-reference';
-
-it('should build a product-price reference', () => {
-  const built =
-    productPriceReference().build<TReferenceDraft<'product-price'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'product-price',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/product-price/product-price-reference.ts b/models/commons/src/reference/reference-draft/presets/product-price/product-price-reference.ts
deleted file mode 100644
index 0f61a3758..000000000
--- a/models/commons/src/reference/reference-draft/presets/product-price/product-price-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const productPriceReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('product-price');
-
-export default productPriceReference;
diff --git a/models/commons/src/reference/reference-draft/presets/product-selection-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/product-selection-draft-reference.ts
new file mode 100644
index 000000000..213b332e3
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/product-selection-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.productSelection);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/product-selection/index.ts b/models/commons/src/reference/reference-draft/presets/product-selection/index.ts
deleted file mode 100644
index 9ac7a7ce2..000000000
--- a/models/commons/src/reference/reference-draft/presets/product-selection/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './product-selection-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/product-selection/product-selection-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/product-selection/product-selection-reference.spec.ts
deleted file mode 100644
index 41f48d8fe..000000000
--- a/models/commons/src/reference/reference-draft/presets/product-selection/product-selection-reference.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import productSelectionReference from './product-selection-reference';
-
-it('should build a product-selection reference', () => {
-  const built =
-    productSelectionReference().build<TReferenceDraft<'product-selection'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'product-selection',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/product-selection/product-selection-reference.ts b/models/commons/src/reference/reference-draft/presets/product-selection/product-selection-reference.ts
deleted file mode 100644
index 88a6785ec..000000000
--- a/models/commons/src/reference/reference-draft/presets/product-selection/product-selection-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const productSelectionReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('product-selection');
-
-export default productSelectionReference;
diff --git a/models/commons/src/reference/reference-draft/presets/product-type-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/product-type-draft-reference.ts
new file mode 100644
index 000000000..508c7acdd
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/product-type-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.productType);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/product-type/index.ts b/models/commons/src/reference/reference-draft/presets/product-type/index.ts
deleted file mode 100644
index e251d7f48..000000000
--- a/models/commons/src/reference/reference-draft/presets/product-type/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './product-type-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/product-type/product-type-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/product-type/product-type-reference.spec.ts
deleted file mode 100644
index 3c0618d52..000000000
--- a/models/commons/src/reference/reference-draft/presets/product-type/product-type-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import productTypeReference from './product-type-reference';
-
-it('should build a product-type reference', () => {
-  const built = productTypeReference().build<TReferenceDraft<'product-type'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'product-type',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/product-type/product-type-reference.ts b/models/commons/src/reference/reference-draft/presets/product-type/product-type-reference.ts
deleted file mode 100644
index 040e5b270..000000000
--- a/models/commons/src/reference/reference-draft/presets/product-type/product-type-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const productTypeReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('product-type');
-
-export default productTypeReference;
diff --git a/models/commons/src/reference/reference-draft/presets/product/index.ts b/models/commons/src/reference/reference-draft/presets/product/index.ts
deleted file mode 100644
index 4de335030..000000000
--- a/models/commons/src/reference/reference-draft/presets/product/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './product-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/product/product-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/product/product-reference.spec.ts
deleted file mode 100644
index 627d8b804..000000000
--- a/models/commons/src/reference/reference-draft/presets/product/product-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import productReference from './product-reference';
-
-it('should build a product reference', () => {
-  const built = productReference().build<TReferenceDraft<'product'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'product',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/product/product-reference.ts b/models/commons/src/reference/reference-draft/presets/product/product-reference.ts
deleted file mode 100644
index 0242b286c..000000000
--- a/models/commons/src/reference/reference-draft/presets/product/product-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const productReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('product');
-
-export default productReference;
diff --git a/models/commons/src/reference/reference-draft/presets/quote-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/quote-draft-reference.ts
new file mode 100644
index 000000000..7e6342658
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/quote-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.quote);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/quote-request-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/quote-request-draft-reference.ts
new file mode 100644
index 000000000..c03df9b4d
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/quote-request-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.quoteRequest);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/quote-request/index.ts b/models/commons/src/reference/reference-draft/presets/quote-request/index.ts
deleted file mode 100644
index 2b327ba45..000000000
--- a/models/commons/src/reference/reference-draft/presets/quote-request/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './quote-request-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/quote-request/quote-request-reference.ts b/models/commons/src/reference/reference-draft/presets/quote-request/quote-request-reference.ts
deleted file mode 100644
index 8ecdacb47..000000000
--- a/models/commons/src/reference/reference-draft/presets/quote-request/quote-request-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const quoteRequestReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('quote-request');
-
-export default quoteRequestReference;
diff --git a/models/commons/src/reference/reference-draft/presets/quote-request/quote-request.spec.ts b/models/commons/src/reference/reference-draft/presets/quote-request/quote-request.spec.ts
deleted file mode 100644
index 492650b71..000000000
--- a/models/commons/src/reference/reference-draft/presets/quote-request/quote-request.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import quoteRequestReference from './quote-request-reference';
-
-it('should build a quote-request reference', () => {
-  const built =
-    quoteRequestReference().build<TReferenceDraft<'quote-request'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'quote-request',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/quote/index.ts b/models/commons/src/reference/reference-draft/presets/quote/index.ts
deleted file mode 100644
index a210c5b03..000000000
--- a/models/commons/src/reference/reference-draft/presets/quote/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './quote-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/quote/quote-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/quote/quote-reference.spec.ts
deleted file mode 100644
index bc36ac345..000000000
--- a/models/commons/src/reference/reference-draft/presets/quote/quote-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import quoteReference from './quote-reference';
-
-it('should build a quote reference', () => {
-  const built = quoteReference().build<TReferenceDraft<'quote'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'quote',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/quote/quote-reference.ts b/models/commons/src/reference/reference-draft/presets/quote/quote-reference.ts
deleted file mode 100644
index 2fdfbf306..000000000
--- a/models/commons/src/reference/reference-draft/presets/quote/quote-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const quoteReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('quote');
-
-export default quoteReference;
diff --git a/models/commons/src/reference/reference-draft/presets/review-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/review-draft-reference.ts
new file mode 100644
index 000000000..0b8933ff0
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/review-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.review);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/review/index.ts b/models/commons/src/reference/reference-draft/presets/review/index.ts
deleted file mode 100644
index 41ba26e16..000000000
--- a/models/commons/src/reference/reference-draft/presets/review/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './review-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/review/review-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/review/review-reference.spec.ts
deleted file mode 100644
index 7a64e8835..000000000
--- a/models/commons/src/reference/reference-draft/presets/review/review-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import reviewReference from './review-reference';
-
-it('should build a review reference', () => {
-  const built = reviewReference().build<TReferenceDraft<'review'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'review',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/review/review-reference.ts b/models/commons/src/reference/reference-draft/presets/review/review-reference.ts
deleted file mode 100644
index 77f41141c..000000000
--- a/models/commons/src/reference/reference-draft/presets/review/review-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const reviewReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('review');
-
-export default reviewReference;
diff --git a/models/commons/src/reference/reference-draft/presets/shipping-method-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/shipping-method-draft-reference.ts
new file mode 100644
index 000000000..bdb5faee8
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/shipping-method-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.shippingMethod);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/shipping-method/index.ts b/models/commons/src/reference/reference-draft/presets/shipping-method/index.ts
deleted file mode 100644
index 1680242e2..000000000
--- a/models/commons/src/reference/reference-draft/presets/shipping-method/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './shipping-method-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/shipping-method/shipping-method-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/shipping-method/shipping-method-reference.spec.ts
deleted file mode 100644
index aca3f2c79..000000000
--- a/models/commons/src/reference/reference-draft/presets/shipping-method/shipping-method-reference.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import shippingMethodReference from './shipping-method-reference';
-
-it('should build a shipping-method reference', () => {
-  const built =
-    shippingMethodReference().build<TReferenceDraft<'shipping-method'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'shipping-method',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/shipping-method/shipping-method-reference.ts b/models/commons/src/reference/reference-draft/presets/shipping-method/shipping-method-reference.ts
deleted file mode 100644
index 42863ee0e..000000000
--- a/models/commons/src/reference/reference-draft/presets/shipping-method/shipping-method-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const shippingMethodReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('shipping-method');
-
-export default shippingMethodReference;
diff --git a/models/commons/src/reference/reference-draft/presets/shopping-list-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/shopping-list-draft-reference.ts
new file mode 100644
index 000000000..fe936bfa4
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/shopping-list-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.shoppingList);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/shopping-list/index.ts b/models/commons/src/reference/reference-draft/presets/shopping-list/index.ts
deleted file mode 100644
index 983d68ae2..000000000
--- a/models/commons/src/reference/reference-draft/presets/shopping-list/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './shopping-list-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/shopping-list/shopping-list-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/shopping-list/shopping-list-reference.spec.ts
deleted file mode 100644
index b84805467..000000000
--- a/models/commons/src/reference/reference-draft/presets/shopping-list/shopping-list-reference.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import shoppingListReference from './shopping-list-reference';
-
-it('should build a shopping-list reference', () => {
-  const built =
-    shoppingListReference().build<TReferenceDraft<'shopping-list'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'shopping-list',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/shopping-list/shopping-list-reference.ts b/models/commons/src/reference/reference-draft/presets/shopping-list/shopping-list-reference.ts
deleted file mode 100644
index eb5c22235..000000000
--- a/models/commons/src/reference/reference-draft/presets/shopping-list/shopping-list-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const shoppingListReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('shopping-list');
-
-export default shoppingListReference;
diff --git a/models/commons/src/reference/reference-draft/presets/staged-quote-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/staged-quote-draft-reference.ts
new file mode 100644
index 000000000..870375618
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/staged-quote-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.stagedQuote);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/staged-quote/index.ts b/models/commons/src/reference/reference-draft/presets/staged-quote/index.ts
deleted file mode 100644
index 01d20b1d2..000000000
--- a/models/commons/src/reference/reference-draft/presets/staged-quote/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './staged-quote-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/staged-quote/staged-quote-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/staged-quote/staged-quote-reference.spec.ts
deleted file mode 100644
index fc6e8536a..000000000
--- a/models/commons/src/reference/reference-draft/presets/staged-quote/staged-quote-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import stagedQuoteReference from './staged-quote-reference';
-
-it('should build a staged-quote reference', () => {
-  const built = stagedQuoteReference().build<TReferenceDraft<'staged-quote'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'staged-quote',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/staged-quote/staged-quote-reference.ts b/models/commons/src/reference/reference-draft/presets/staged-quote/staged-quote-reference.ts
deleted file mode 100644
index b3db59013..000000000
--- a/models/commons/src/reference/reference-draft/presets/staged-quote/staged-quote-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const stagedQuoteReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('staged-quote');
-
-export default stagedQuoteReference;
diff --git a/models/commons/src/reference/reference-draft/presets/standalone-price-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/standalone-price-draft-reference.ts
new file mode 100644
index 000000000..cfba4a645
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/standalone-price-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.standalonePrice);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/standalone-price/index.ts b/models/commons/src/reference/reference-draft/presets/standalone-price/index.ts
deleted file mode 100644
index 80e15b64a..000000000
--- a/models/commons/src/reference/reference-draft/presets/standalone-price/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './standalone-price-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/standalone-price/standalone-price-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/standalone-price/standalone-price-reference.spec.ts
deleted file mode 100644
index 40f60ebe7..000000000
--- a/models/commons/src/reference/reference-draft/presets/standalone-price/standalone-price-reference.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import standalonePriceReference from './standalone-price-reference';
-
-it('should build a standalone-price reference', () => {
-  const built =
-    standalonePriceReference().build<TReferenceDraft<'standalone-price'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'standalone-price',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/standalone-price/standalone-price-reference.ts b/models/commons/src/reference/reference-draft/presets/standalone-price/standalone-price-reference.ts
deleted file mode 100644
index 5f00a64b5..000000000
--- a/models/commons/src/reference/reference-draft/presets/standalone-price/standalone-price-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const standalonePriceReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('standalone-price');
-
-export default standalonePriceReference;
diff --git a/models/commons/src/reference/reference-draft/presets/state-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/state-draft-reference.ts
new file mode 100644
index 000000000..8b9022da4
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/state-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.state);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/state/index.ts b/models/commons/src/reference/reference-draft/presets/state/index.ts
deleted file mode 100644
index 266395120..000000000
--- a/models/commons/src/reference/reference-draft/presets/state/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './state-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/state/state-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/state/state-reference.spec.ts
deleted file mode 100644
index 4a6d6ea31..000000000
--- a/models/commons/src/reference/reference-draft/presets/state/state-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import stateReference from './state-reference';
-
-it('should build a state reference', () => {
-  const built = stateReference().build<TReferenceDraft<'state'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'state',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/state/state-reference.ts b/models/commons/src/reference/reference-draft/presets/state/state-reference.ts
deleted file mode 100644
index a921cc888..000000000
--- a/models/commons/src/reference/reference-draft/presets/state/state-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const stateReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('state');
-
-export default stateReference;
diff --git a/models/commons/src/reference/reference-draft/presets/store-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/store-draft-reference.ts
new file mode 100644
index 000000000..1b9f9ad1b
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/store-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.store);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/store/index.ts b/models/commons/src/reference/reference-draft/presets/store/index.ts
deleted file mode 100644
index 12bb38f86..000000000
--- a/models/commons/src/reference/reference-draft/presets/store/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './store-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/store/store-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/store/store-reference.spec.ts
deleted file mode 100644
index aed772b1d..000000000
--- a/models/commons/src/reference/reference-draft/presets/store/store-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import storeReference from './store-reference';
-
-it('should build a store reference', () => {
-  const built = storeReference().build<TReferenceDraft<'store'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'store',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/store/store-reference.ts b/models/commons/src/reference/reference-draft/presets/store/store-reference.ts
deleted file mode 100644
index 31bfb0223..000000000
--- a/models/commons/src/reference/reference-draft/presets/store/store-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const storeReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('store');
-
-export default storeReference;
diff --git a/models/commons/src/reference/reference-draft/presets/subscription-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/subscription-draft-reference.ts
new file mode 100644
index 000000000..93bd39407
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/subscription-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.subscription);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/subscription/index.ts b/models/commons/src/reference/reference-draft/presets/subscription/index.ts
deleted file mode 100644
index 512cf1f49..000000000
--- a/models/commons/src/reference/reference-draft/presets/subscription/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './subscription-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/subscription/subscription-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/subscription/subscription-reference.spec.ts
deleted file mode 100644
index 48306e4e5..000000000
--- a/models/commons/src/reference/reference-draft/presets/subscription/subscription-reference.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import subscriptionReference from './subscription-reference';
-
-it('should build a subscription reference', () => {
-  const built =
-    subscriptionReference().build<TReferenceDraft<'subscription'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'subscription',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/subscription/subscription-reference.ts b/models/commons/src/reference/reference-draft/presets/subscription/subscription-reference.ts
deleted file mode 100644
index ebc4fb489..000000000
--- a/models/commons/src/reference/reference-draft/presets/subscription/subscription-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const subscriptionReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('subscription');
-
-export default subscriptionReference;
diff --git a/models/commons/src/reference/reference-draft/presets/tax-category-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/tax-category-draft-reference.ts
new file mode 100644
index 000000000..9fc3bf5da
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/tax-category-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.taxCategory);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/tax-category/index.ts b/models/commons/src/reference/reference-draft/presets/tax-category/index.ts
deleted file mode 100644
index 574ea5fe6..000000000
--- a/models/commons/src/reference/reference-draft/presets/tax-category/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './tax-category-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/tax-category/tax-category-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/tax-category/tax-category-reference.spec.ts
deleted file mode 100644
index 55af9a925..000000000
--- a/models/commons/src/reference/reference-draft/presets/tax-category/tax-category-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import taxCategoryReference from './tax-category-reference';
-
-it('should build a tax-category reference', () => {
-  const built = taxCategoryReference().build<TReferenceDraft<'tax-category'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'tax-category',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/tax-category/tax-category-reference.ts b/models/commons/src/reference/reference-draft/presets/tax-category/tax-category-reference.ts
deleted file mode 100644
index db85dfd0c..000000000
--- a/models/commons/src/reference/reference-draft/presets/tax-category/tax-category-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const taxCategoryReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('tax-category');
-
-export default taxCategoryReference;
diff --git a/models/commons/src/reference/reference-draft/presets/type-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/type-draft-reference.ts
new file mode 100644
index 000000000..f276fbf3c
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/type-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.type);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/type/index.ts b/models/commons/src/reference/reference-draft/presets/type/index.ts
deleted file mode 100644
index 59edd62fd..000000000
--- a/models/commons/src/reference/reference-draft/presets/type/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './type-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/type/type-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/type/type-reference.spec.ts
deleted file mode 100644
index 88cd318b6..000000000
--- a/models/commons/src/reference/reference-draft/presets/type/type-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import typeReference from './type-reference';
-
-it('should build a type reference', () => {
-  const built = typeReference().build<TReferenceDraft<'type'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'type',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/type/type-reference.ts b/models/commons/src/reference/reference-draft/presets/type/type-reference.ts
deleted file mode 100644
index f46df3046..000000000
--- a/models/commons/src/reference/reference-draft/presets/type/type-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const typeReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('type');
-
-export default typeReference;
diff --git a/models/commons/src/reference/reference-draft/presets/zone-draft-reference.ts b/models/commons/src/reference/reference-draft/presets/zone-draft-reference.ts
new file mode 100644
index 000000000..65b50590a
--- /dev/null
+++ b/models/commons/src/reference/reference-draft/presets/zone-draft-reference.ts
@@ -0,0 +1,6 @@
+import { referenceTypes } from '../../constants';
+import { buildReferenceDraftPresets } from './_shared/reference-draft-presets-builder';
+
+const presets = buildReferenceDraftPresets(referenceTypes.zone);
+
+export default presets;
diff --git a/models/commons/src/reference/reference-draft/presets/zone/index.ts b/models/commons/src/reference/reference-draft/presets/zone/index.ts
deleted file mode 100644
index 8d4c1c68c..000000000
--- a/models/commons/src/reference/reference-draft/presets/zone/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './zone-reference';
diff --git a/models/commons/src/reference/reference-draft/presets/zone/zone-reference.spec.ts b/models/commons/src/reference/reference-draft/presets/zone/zone-reference.spec.ts
deleted file mode 100644
index 19d7cdd36..000000000
--- a/models/commons/src/reference/reference-draft/presets/zone/zone-reference.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TReferenceDraft } from '../../../types';
-import zoneReference from './zone-reference';
-
-it('should build a zone reference', () => {
-  const built = zoneReference().build<TReferenceDraft<'zone'>>();
-  expect(built).toEqual({
-    id: expect.any(String),
-    typeId: 'zone',
-  });
-});
diff --git a/models/commons/src/reference/reference-draft/presets/zone/zone-reference.ts b/models/commons/src/reference/reference-draft/presets/zone/zone-reference.ts
deleted file mode 100644
index 6f12dc41b..000000000
--- a/models/commons/src/reference/reference-draft/presets/zone/zone-reference.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TReferenceDraftBuilder } from '../../../types';
-import ReferenceDraft from '../../builder';
-
-const zoneReference = (): TReferenceDraftBuilder =>
-  ReferenceDraft().typeId('zone');
-
-export default zoneReference;
diff --git a/models/commons/src/reference/reference-draft/transformers.ts b/models/commons/src/reference/reference-draft/transformers.ts
deleted file mode 100644
index 89697e213..000000000
--- a/models/commons/src/reference/reference-draft/transformers.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Transformer } from '@commercetools-test-data/core';
-import omit from 'lodash/omit';
-import type {
-  TReferenceDraft,
-  TReferenceDraftGraphql,
-  TReferenceRest,
-} from '../types';
-
-const transformers = {
-  default: Transformer<TReferenceDraft, TReferenceDraft>('default', {}),
-  rest: Transformer<TReferenceDraft, TReferenceRest>('rest', {
-    replaceFields: ({ fields }) => ({
-      ...fields,
-      obj: omit(fields, ['typeId']),
-    }),
-  }),
-  // we do not add the expanded object ourselves
-  // since some fields are pure `*Ref`, e.g `channelsRef`
-  // with no option to expand.
-  graphql: Transformer<TReferenceDraft, TReferenceDraftGraphql>('graphql', {}),
-};
-
-export default transformers;
diff --git a/models/commons/src/reference/transformers.ts b/models/commons/src/reference/transformers.ts
deleted file mode 100644
index 6448ecee8..000000000
--- a/models/commons/src/reference/transformers.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Transformer } from '@commercetools-test-data/core';
-import omit from 'lodash/omit';
-import type {
-  TExpandedReferenceObject,
-  TReference,
-  TReferenceGraphql,
-  TReferenceRest,
-} from './types';
-
-const transformers = {
-  default: Transformer<TReference, TReference>('default', {}),
-  rest: Transformer<TReference, TReferenceRest>('rest', {
-    buildFields: ['obj'],
-    replaceFields: ({ fields }) => {
-      return {
-        ...fields,
-        obj:
-          (fields.obj as TExpandedReferenceObject) || omit(fields, ['typeId']),
-      };
-    },
-  }),
-  // we do not add the expanded object ourselves
-  // since some fields are pure `*Ref`, e.g `channelsRef`
-  // with no option to expand.
-  graphql: Transformer<TReference, TReferenceGraphql>('graphql', {
-    addFields: () => ({
-      __typename: 'Reference',
-    }),
-  }),
-};
-
-export default transformers;
diff --git a/models/commons/src/reference/types.ts b/models/commons/src/reference/types.ts
index f3225085f..3ba9a1473 100644
--- a/models/commons/src/reference/types.ts
+++ b/models/commons/src/reference/types.ts
@@ -1,8 +1,23 @@
 import type { TBuilder } from '@commercetools-test-data/core';
 import { TCtpReference } from '@commercetools-test-data/graphql-types';
 
-export type TReferenceBuilder<TypeId = string> = TBuilder<TReference<TypeId>>;
+// export interface BusinessUnitReference {
+//     readonly typeId: 'business-unit';
+//     /**
+//      *	Unique identifier of the referenced [BusinessUnit](ctp:api:type:BusinessUnit).
+//      *
+//      *
+//      */
+//     readonly id: string;
+//     /**
+//      *	Contains the representation of the expanded BusinessUnit. Only present in responses to requests with [Reference Expansion](/../api/general-concepts#reference-expansion) for BusinessUnit.
+//      *
+//      *
+//      */
+//     readonly obj?: BusinessUnit;
+// }
 
+// Legacy model
 export interface TReference<TypeId = string> {
   typeId: TypeId;
   id: string;
@@ -17,15 +32,12 @@ export type TExpandedReferenceObject<TypeId = string> = {
   version?: number;
 };
 
-export type TCreateReferenceBuilder<TypeId = string> =
-  () => TReferenceBuilder<TypeId>;
-
 export type TReferenceRest<
   TypeId = string,
   ExpandedObject extends
     TExpandedReferenceObject<TypeId> = TExpandedReferenceObject<TypeId>,
-> = TReference<TypeId> & {
-  obj: ExpandedObject;
+> = Omit<TReference<TypeId>, 'obj'> & {
+  obj?: ExpandedObject;
 };
 
 export type TReferenceGraphql<TypeId = string> = Omit<
@@ -35,17 +47,32 @@ export type TReferenceGraphql<TypeId = string> = Omit<
   typeId: TypeId;
 };
 
-// Draft representation
-export interface TReferenceDraft<TypeId = string> {
+// Draft representations
+export type TReferenceDraft<TypeId = string> = {
   typeId: TypeId;
   id: string;
-}
+};
+
+export type TReferenceDraftRest<TypeId = string> = TReferenceDraft<TypeId>;
+
+export type TReferenceDraftGraphql<TypeId = string> = TReferenceDraft<TypeId>;
+
+// Builders
+// export type TCreateReferenceBuilder<TypeId = string> =
+//   () => TReferenceBuilder<TypeId>;
+
+// export type TReferenceBuilder<TypeId = string> = TBuilder<TReference<TypeId>>;
 
-export type TReferenceDraftGraphql<TypeId = string> =
-  TExpandedReferenceObject<TypeId>;
+// export type TReferenceDraftBuilder<TypeId = string> = TBuilder<
+//   TReferenceDraft<TypeId>
+// >;
+// export type TCreateReferenceDraftBuilder<TypeId = string> =
+//   () => TReferenceDraftBuilder<TypeId>;
 
-export type TReferenceDraftBuilder<TypeId = string> = TBuilder<
-  TReferenceDraft<TypeId>
->;
-export type TCreateReferenceDraftBuilder<TypeId = string> =
-  () => TReferenceDraftBuilder<TypeId>;
+export type TCreateReferenceBuilder<
+  TReferenceModel extends
+    | TReferenceRest
+    | TReferenceGraphql
+    | TReferenceDraftRest
+    | TReferenceDraftGraphql,
+> = () => TBuilder<TReferenceModel>;
diff --git a/models/product/src/product/product-draft/presets/empty.spec.ts b/models/product/src/product/product-draft/presets/empty.spec.ts
index d66e0e09c..db0ca9129 100644
--- a/models/product/src/product/product-draft/presets/empty.spec.ts
+++ b/models/product/src/product/product-draft/presets/empty.spec.ts
@@ -11,6 +11,7 @@ it(`should set all specified fields to undefined`, () => {
   expect(emptyProductDraft.productType).toEqual({
     id: expect.any(String),
     typeId: expect.any(String),
+    obj: expect.any(Object),
   });
   expect(emptyProductDraft.slug).toEqual({
     de: expect.any(String),