diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f546d209..3a886c4e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,14 @@
-# Changelog 
-
-[Unreleased changes](https://github.com/rapidez/core/compare/4.8.0...4.8.0)
-## [4.8.0](https://github.com/rapidez/core/releases/tag/4.8.0) - 2025-10-14
-
+# Changelog
+
+[Unreleased changes](https://github.com/rapidez/core/compare/5.0.0-alpha.1...5.0.0-alpha.1)
+## [5.0.0-alpha.1](https://github.com/rapidez/core/releases/tag/5.0.0-alpha.1) - 2025-11-11
+
+### Changed
+
+- Use EAV structure instead of flat tables (#943)
+
+## [4.8.0](https://github.com/rapidez/core/releases/tag/4.8.0) - 2025-10-14
+
 ### Added
 
 - Playwright attach Lighthouse report (#1036)
@@ -24,38 +30,38 @@
 - Missing brackets fix (#1041)
 - Disable setting guest email when guest checkout is disabled (#1040)
 - Playwright publish payment icons (#1045)
-- Unknown turbo-frame error fix (#1048)
-
-## [4.7.6](https://github.com/rapidez/core/releases/tag/4.7.6) - 2025-10-02
-
+- Unknown turbo-frame error fix (#1048)
+
+## [4.7.6](https://github.com/rapidez/core/releases/tag/4.7.6) - 2025-10-02
+
 ### Fixed
 
 - Remove legacy Vite config (#1020)
 - Defer cart watcher to next tick to avoid race condition (#1006)
 - Blade components update removing the disabled state (#1028)
-- Playwright Magento version tag (#1035)
-
-## [4.7.5](https://github.com/rapidez/core/releases/tag/4.7.5) - 2025-09-26
-
+- Playwright Magento version tag (#1035)
+
+## [4.7.5](https://github.com/rapidez/core/releases/tag/4.7.5) - 2025-09-26
+
 ### Fixed
 
-- Use npm workspaces for Rapidez dependencies (#1026)
-
-## [4.7.4](https://github.com/rapidez/core/releases/tag/4.7.4) - 2025-09-26
-
+- Use npm workspaces for Rapidez dependencies (#1026)
+
+## [4.7.4](https://github.com/rapidez/core/releases/tag/4.7.4) - 2025-09-26
+
 ### Fixed
 
 - Playwright wait for footer on success page (#1024)
-- Package.json name and version (#1025)
-
-## [4.7.3](https://github.com/rapidez/core/releases/tag/4.7.3) - 2025-09-26
-
+- Package.json name and version (#1025)
+
+## [4.7.3](https://github.com/rapidez/core/releases/tag/4.7.3) - 2025-09-26
+
 ### Fixed
 
-- Playwright test fix (#1023)
-
-## [4.7.2](https://github.com/rapidez/core/releases/tag/4.7.2) - 2025-09-26
-
+- Playwright test fix (#1023)
+
+## [4.7.2](https://github.com/rapidez/core/releases/tag/4.7.2) - 2025-09-26
+
 ### Fixed
 
 - Slider arrows color fix (#1017)
@@ -63,16 +69,16 @@
 - Autocomplete focus on mobile fix (#1018)
 - Playwright use screenshot method everywhere (#1022)
 - GraphQL mutation notification event fix (#1021)
-- Fire login event when logged in customer changes (#1019)
-
-## [4.7.1](https://github.com/rapidez/core/releases/tag/4.7.1) - 2025-09-18
-
+- Fire login event when logged in customer changes (#1019)
+
+## [4.7.1](https://github.com/rapidez/core/releases/tag/4.7.1) - 2025-09-18
+
 ### Fixed
 
-- Playwright checkout step wait fix (#1015)
-
-## [4.7.0](https://github.com/rapidez/core/releases/tag/4.7.0) - 2025-09-17
-
+- Playwright checkout step wait fix (#1015)
+
+## [4.7.0](https://github.com/rapidez/core/releases/tag/4.7.0) - 2025-09-17
+
 ### Added
 
 - Checkbox and radio product option inputs (#1013)
@@ -81,30 +87,30 @@
 
 - Ignore .env for local Playwright runs (ed935d9)
 - Custom cart attributes label fix (#1009)
-- Recently viewed widget sorting (#1014)
-
-## [4.6.3](https://github.com/rapidez/core/releases/tag/4.6.3) - 2025-09-16
-
+- Recently viewed widget sorting (#1014)
+
+## [4.6.3](https://github.com/rapidez/core/releases/tag/4.6.3) - 2025-09-16
+
 ### Fixed
 
-- Playwright unique blob report names (#1012)
-
-## [4.6.2](https://github.com/rapidez/core/releases/tag/4.6.2) - 2025-09-16
-
+- Playwright unique blob report names (#1012)
+
+## [4.6.2](https://github.com/rapidez/core/releases/tag/4.6.2) - 2025-09-16
+
 ### Fixed
 
-- Playwright checkout page optional login possibility (#1011)
-
-## [4.6.1](https://github.com/rapidez/core/releases/tag/4.6.1) - 2025-09-16
-
+- Playwright checkout page optional login possibility (#1011)
+
+## [4.6.1](https://github.com/rapidez/core/releases/tag/4.6.1) - 2025-09-16
+
 ### Fixed
 
 - Set gallery fetchpriority high (c5d82df)
 - Test with a clean Magento config (#1007)
-- Playwright extendable screenshot options (#1010)
-
-## [4.6.0](https://github.com/rapidez/core/releases/tag/4.6.0) - 2025-09-12
-
+- Playwright extendable screenshot options (#1010)
+
+## [4.6.0](https://github.com/rapidez/core/releases/tag/4.6.0) - 2025-09-12
+
 ### Added
 
 - Playwright Lighthouse score tests (#1003)
@@ -114,10 +120,10 @@
 
 - Listing min height preventing layout shifts (#1000)
 - Use option instead of argument for index call (#1001)
-- Fix null check for auth (#1004)
-
-## [4.5.0](https://github.com/rapidez/core/releases/tag/4.5.0) - 2025-09-10
-
+- Fix null check for auth (#1004)
+
+## [4.5.0](https://github.com/rapidez/core/releases/tag/4.5.0) - 2025-09-10
+
 ### Added
 
 - Productlist items slot (#978)
@@ -141,10 +147,10 @@
 - Subfolder store image location fix (#993)
 - Success page login required to view order fallback (#980)
 - Prevent split on category_lvl1 reference (#998)
-- Playwright failed test screenshots in all browsers (#999)
-
-## [4.4.0](https://github.com/rapidez/core/releases/tag/4.4.0) - 2025-08-15
-
+- Playwright failed test screenshots in all browsers (#999)
+
+## [4.4.0](https://github.com/rapidez/core/releases/tag/4.4.0) - 2025-08-15
+
 ### Added
 
 - Playwright tests replacing Dusk tests (#945)
@@ -169,10 +175,10 @@
 - Unique autocomplete ids (#973)
 - Cookie expiration & login failed notification fix (#974)
 - Do not show the Magento error on an invalid login (#975)
-- Cart total/tax fixes (#961)
-
-## [4.3.0](https://github.com/rapidez/core/releases/tag/4.3.0) - 2025-07-29
-
+- Cart total/tax fixes (#961)
+
+## [4.3.0](https://github.com/rapidez/core/releases/tag/4.3.0) - 2025-07-29
+
 ### Added
 
 - Popular products on no search results page + category position fix (#926)
@@ -190,10 +196,10 @@
 - Slider index fix (#947)
 - Default notification types (#948)
 - Newsletter input translation (#949)
-- Field date mapping format (#952)
-
-## [4.2.0](https://github.com/rapidez/core/releases/tag/4.2.0) - 2025-07-22
-
+- Field date mapping format (#952)
+
+## [4.2.0](https://github.com/rapidez/core/releases/tag/4.2.0) - 2025-07-22
+
 ### Added
 
 - OpenSearch support (#916, #933)
@@ -216,10 +222,10 @@
 - Small bugfixes (#935)
 - Backorder and fixed product taxes in cart query (#937)
 - Bugfixes (#938)
-- Use collect()->partition() to keep L11 support (#939)
-
-## [4.1.0](https://github.com/rapidez/core/releases/tag/4.1.0) - 2025-07-01
-
+- Use collect()->partition() to keep L11 support (#939)
+
+## [4.1.0](https://github.com/rapidez/core/releases/tag/4.1.0) - 2025-07-01
+
 ### Added
 
 - Dusk tests with 2.4.7-p6 and 2.4.8-p1 (#890)
@@ -239,26 +245,26 @@
 - Special price mapping (#894)
 - Only select value fields for int select fields (#901)
 - Quantity step increments fix (#907)
-- Support negative product option prices (#913)
-
-## [4.0.1](https://github.com/rapidez/core/releases/tag/4.0.1) - 2025-06-06
-
+- Support negative product option prices (#913)
+
+## [4.0.1](https://github.com/rapidez/core/releases/tag/4.0.1) - 2025-06-06
+
 ### Fixed
 
 - Consistent Eventy filter names (#886)
 - Empty page title fix (#888)
-- Highlight tag flicker fix (#889)
-
-## [4.0.0](https://github.com/rapidez/core/releases/tag/4.0.0) - 2025-06-05
-
+- Highlight tag flicker fix (#889)
+
+## [4.0.0](https://github.com/rapidez/core/releases/tag/4.0.0) - 2025-06-05
+
 See the upgrade guide: https://docs.rapidez.io/4.x/upgrading.html
 
 ### Changed
 
-- InstantSearch migration (#706)
-
-## [3.9.0](https://github.com/rapidez/core/releases/tag/3.9.0) - 2025-05-21
-
+- InstantSearch migration (#706)
+
+## [3.9.0](https://github.com/rapidez/core/releases/tag/3.9.0) - 2025-05-21
+
 ### Added
 
 - pro6pp package in the install command (#863)
@@ -272,10 +278,10 @@ See the upgrade guide: https://docs.rapidez.io/4.x/upgrading.html
 - Turbo navigate back fix (#851)
 - Navigation fix on Firefox (#857)
 - Autocomplete focus error fix (#858)
-- Only fire product attribute change when it's changed (#864)
-
-## [3.8.0](https://github.com/rapidez/core/releases/tag/3.8.0) - 2025-05-14
-
+- Only fire product attribute change when it's changed (#864)
+
+## [3.8.0](https://github.com/rapidez/core/releases/tag/3.8.0) - 2025-05-14
+
 ### Added
 
 - More Magento redirects (#845)
@@ -283,10 +289,10 @@ See the upgrade guide: https://docs.rapidez.io/4.x/upgrading.html
 
 ### Fixed
 
-- Do not show the arrows on the quantity input fix (#844)
-
-## [3.7.0](https://github.com/rapidez/core/releases/tag/3.7.0) - 2025-05-01
-
+- Do not show the arrows on the quantity input fix (#844)
+
+## [3.7.0](https://github.com/rapidez/core/releases/tag/3.7.0) - 2025-05-01
+
 ### Added
 
 - Magento 2.4.7-p5 and 2.4.8 tests (#808)
@@ -300,10 +306,10 @@ See the upgrade guide: https://docs.rapidez.io/4.x/upgrading.html
 ### Fixed
 
 - Track fetches globally (#806)
-- Use the current fetch instead of a cached version (#829)
-
-## [3.6.0](https://github.com/rapidez/core/releases/tag/3.6.0) - 2025-04-18
-
+- Use the current fetch instead of a cached version (#829)
+
+## [3.6.0](https://github.com/rapidez/core/releases/tag/3.6.0) - 2025-04-18
+
 ### Added
 
 - Magento link widgets (#792, #812)
@@ -317,17 +323,17 @@ See the upgrade guide: https://docs.rapidez.io/4.x/upgrading.html
 
 ### Fixed
 
-- Select default shipping method if no shipping method is set (#814)
-
-## [3.5.1](https://github.com/rapidez/core/releases/tag/3.5.1) - 2025-04-11
-
+- Select default shipping method if no shipping method is set (#814)
+
+## [3.5.1](https://github.com/rapidez/core/releases/tag/3.5.1) - 2025-04-11
+
 ### Fixed
 
 - Install additional package requirements from the install command (#809)
-- Just mention the Rapidez Statamic install command (#810)
-
-## [3.5.0](https://github.com/rapidez/core/releases/tag/3.5.0) - 2025-04-10
-
+- Just mention the Rapidez Statamic install command (#810)
+
+## [3.5.0](https://github.com/rapidez/core/releases/tag/3.5.0) - 2025-04-10
+
 ### Added
 
 - Laravel 12 and PHP 8.4 support (#763)
@@ -345,10 +351,10 @@ See the upgrade guide: https://docs.rapidez.io/4.x/upgrading.html
 - Return 0 instead of void when no taxes (#788)
 - Disable infinite-scroll on productlists (#790)
 - Removed unsupported applied_to and coupon keys (#789)
-- Fixed negative loadingCount (#793)
-
-## [3.4.0](https://github.com/rapidez/core/releases/tag/3.4.0) - 2025-03-25
-
+- Fixed negative loadingCount (#793)
+
+## [3.4.0](https://github.com/rapidez/core/releases/tag/3.4.0) - 2025-03-25
+
 ### Added
 
 - Region select (#738)
@@ -357,10 +363,10 @@ See the upgrade guide: https://docs.rapidez.io/4.x/upgrading.html
 ### Fixed
 
 - Fixed configurable products with 1 child product not selecting properly (#778)
-- Correctly handle combiningGraphql allowing catching (#783)
-
-## [3.3.0](https://github.com/rapidez/core/releases/tag/3.3.0) - 2025-03-20
-
+- Correctly handle combiningGraphql allowing catching (#783)
+
+## [3.3.0](https://github.com/rapidez/core/releases/tag/3.3.0) - 2025-03-20
+
 ### Added
 
 - Custom customer attributes directly on the user store (#767)
@@ -376,10 +382,10 @@ See the upgrade guide: https://docs.rapidez.io/4.x/upgrading.html
 - Allow for arbitrary options in additionals (#751)
 - Cookie notice z-index (#761)
 - Use correct show_tax value (#753)
-- Only use special price when it's lower (#775)
-
-## [3.2.0](https://github.com/rapidez/core/releases/tag/3.2.0) - 2025-02-26
-
+- Only use special price when it's lower (#775)
+
+## [3.2.0](https://github.com/rapidez/core/releases/tag/3.2.0) - 2025-02-26
+
 ### Added
 
 - Standalone checkout signed endpoint (#711)
@@ -409,10 +415,10 @@ See the upgrade guide: https://docs.rapidez.io/4.x/upgrading.html
 - Return type for phpstan (#739)
 - Make sure you can't do a mutation twice simultaneously (#740)
 - Only apply default value when config option is not found (#737)
-- Slideover position (#742)
-
-## [3.1.0](https://github.com/rapidez/core/releases/tag/3.1.0) - 2025-01-24
-
+- Slideover position (#742)
+
+## [3.1.0](https://github.com/rapidez/core/releases/tag/3.1.0) - 2025-01-24
+
 ### Added
 
 - Shadow, outline and ring colors (#691)
@@ -433,20 +439,20 @@ See the upgrade guide: https://docs.rapidez.io/4.x/upgrading.html
 - ReactiveSearch update (#697)
 - Null coalescing for csrf token (#686)
 - Fix error on file removal (#687)
-- Slideover prevent-scroll (#700)
-
-## [3.0.1](https://github.com/rapidez/core/releases/tag/3.0.1) - 2024-12-20
-
+- Slideover prevent-scroll (#700)
+
+## [3.0.1](https://github.com/rapidez/core/releases/tag/3.0.1) - 2024-12-20
+
 ### Fixed
 
 - Review stars closing (4bd7a4a)
 - Properly use of dt/dd within dl (#674)
 - Listen to newsletter/general/active (#676)
 - Small frontend fixes (#677)
-- Get pagesize from url if Turbo is not yet loaded (#681)
-
-## [3.0.0](https://github.com/rapidez/core/releases/tag/3.0.0) - 2024-12-13
-
+- Get pagesize from url if Turbo is not yet loaded (#681)
+
+## [3.0.0](https://github.com/rapidez/core/releases/tag/3.0.0) - 2024-12-13
+
 See the upgrade guide: https://docs.rapidez.io/3.x/upgrading.html
 
 ### Added
@@ -470,10 +476,10 @@ See the upgrade guide: https://docs.rapidez.io/3.x/upgrading.html
 
 ### Fixed
 
-- Reduce javascript bundle size (#604)
-
-## [2.13.0](https://github.com/rapidez/core/releases/tag/2.13.0) - 2024-09-27
-
+- Reduce javascript bundle size (#604)
+
+## [2.13.0](https://github.com/rapidez/core/releases/tag/2.13.0) - 2024-09-27
+
 ### Changed
 
 - Cart summary refactor, listen to the Magento config (#564)
@@ -483,10 +489,10 @@ See the upgrade guide: https://docs.rapidez.io/3.x/upgrading.html
 
 - Change order of cart clearing (#579)
 - Fixed footer newsletter responsiveness and layout shifts (#582)
-- Slideover styling changes (#581)
-
-## [2.12.0](https://github.com/rapidez/core/releases/tag/2.12.0) - 2024-09-24
-
+- Slideover styling changes (#581)
+
+## [2.12.0](https://github.com/rapidez/core/releases/tag/2.12.0) - 2024-09-24
+
 ### Changed
 
 - Blade icons deferring by default (#577)
@@ -496,29 +502,29 @@ See the upgrade guide: https://docs.rapidez.io/3.x/upgrading.html
 - Move default selects to always select (#571)
 - Elasticsearch query script needs to be a string (#574)
 - Filter heading on the category filter (#576)
-- Only sort child images when there are images (#578)
-
-## [2.11.1](https://github.com/rapidez/core/releases/tag/2.11.1) - 2024-09-17
-
+- Only sort child images when there are images (#578)
+
+## [2.11.1](https://github.com/rapidez/core/releases/tag/2.11.1) - 2024-09-17
+
 ### Fixed
 
 - Sort child images by store specific value & listen to disabled (#570)
 - CSRF token on Rapidez API requests (#572)
 - Multiply fixed product tax by item quantity (#568)
-- Don't throw warning when GraphQL component is used without slot (#569)
-
-## [2.11.0](https://github.com/rapidez/core/releases/tag/2.11.0) - 2024-09-10
-
+- Don't throw warning when GraphQL component is used without slot (#569)
+
+## [2.11.0](https://github.com/rapidez/core/releases/tag/2.11.0) - 2024-09-10
+
 ### Changed
 
 - Make Graphql and GraphqlMutation errorCallback the same (#566)
 
 ### Fixed
 
-- Prevent any leftover customer_address_id (#565)
-
-## [2.10.0](https://github.com/rapidez/core/releases/tag/2.10.0) - 2024-09-06
-
+- Prevent any leftover customer_address_id (#565)
+
+## [2.10.0](https://github.com/rapidez/core/releases/tag/2.10.0) - 2024-09-06
+
 ### Changed
 
 - Improved the pagination styling (#558)
@@ -528,17 +534,17 @@ See the upgrade guide: https://docs.rapidez.io/3.x/upgrading.html
 
 - One shipping method title (#556, #557)
 - Redirect when the order can not be fetched from the success page (#553)
-- Publish the .prettierrc.js file with the install command (#562)
-
-## [2.9.2](https://github.com/rapidez/core/releases/tag/2.9.2) - 2024-09-03
-
+- Publish the .prettierrc.js file with the install command (#562)
+
+## [2.9.2](https://github.com/rapidez/core/releases/tag/2.9.2) - 2024-09-03
+
 ### Fixed
 
 - Sliderover header button fix (#554)
-- Checkout progressbar steps correct fallback (#555)
-
-## [2.9.1](https://github.com/rapidez/core/releases/tag/2.9.1) - 2024-08-27
-
+- Checkout progressbar steps correct fallback (#555)
+
+## [2.9.1](https://github.com/rapidez/core/releases/tag/2.9.1) - 2024-08-27
+
 ### Fixed
 
 - Allow UUID's in Elasticsearch (#545)
@@ -546,10 +552,10 @@ See the upgrade guide: https://docs.rapidez.io/3.x/upgrading.html
 - Correct slideover class merging (#548)
 - Correct ReCaptcha header in the GraphQL mutation component (#549)
 - Correct data for the order id for the checkout-payment-saved event (#550)
-- Correctly use parseInt (#551)
-
-## [2.9.0](https://github.com/rapidez/core/releases/tag/2.9.0) - 2024-08-16
-
+- Correctly use parseInt (#551)
+
+## [2.9.0](https://github.com/rapidez/core/releases/tag/2.9.0) - 2024-08-16
+
 ### Added
 
 - Health check for super attributes (#535)
@@ -562,10 +568,10 @@ See the upgrade guide: https://docs.rapidez.io/3.x/upgrading.html
 ### Fixed
 
 - Prevent price addition errors in sliders (#536)
-- Always attempt to decode attribute values (#520)
-
-## [2.8.0](https://github.com/rapidez/core/releases/tag/2.8.0) - 2024-07-24
-
+- Always attempt to decode attribute values (#520)
+
+## [2.8.0](https://github.com/rapidez/core/releases/tag/2.8.0) - 2024-07-24
+
 ### Added
 
 - Notifications from the session (#518)
@@ -575,10 +581,10 @@ See the upgrade guide: https://docs.rapidez.io/3.x/upgrading.html
 
 - Graphql Mutation component typo (#529)
 - Set error message on GraphQL errors as well (#531)
-- Redirect all redirect type rewrites (#534)
-
-## [2.7.0](https://github.com/rapidez/core/releases/tag/2.7.0) - 2024-07-15
-
+- Redirect all redirect type rewrites (#534)
+
+## [2.7.0](https://github.com/rapidez/core/releases/tag/2.7.0) - 2024-07-15
+
 ### Added
 
 - Auto select configurable and product option setting (#515)
@@ -593,10 +599,10 @@ See the upgrade guide: https://docs.rapidez.io/3.x/upgrading.html
 - Fix sidebar (#521)
 - Use computed shipping address in estimateshippingmethod (#522)
 - Prevent errors if add_to_cart config is missing (#526)
-- Fix missing attributeValues and autoselect config errors (#530)
-
-## [2.6.0](https://github.com/rapidez/core/releases/tag/2.6.0) - 2024-06-04
-
+- Fix missing attributeValues and autoselect config errors (#530)
+
+## [2.6.0](https://github.com/rapidez/core/releases/tag/2.6.0) - 2024-06-04
+
 ### Added
 
 - Checkout step and success events (#506)
@@ -605,26 +611,26 @@ See the upgrade guide: https://docs.rapidez.io/3.x/upgrading.html
 ### Fixed
 
 - Reset styling of the listing component (#463)
-- Convert the object to an array (#509)
-
-## [2.5.0](https://github.com/rapidez/core/releases/tag/2.5.0) - 2024-05-28
-
+- Convert the object to an array (#509)
+
+## [2.5.0](https://github.com/rapidez/core/releases/tag/2.5.0) - 2024-05-28
+
 ### Added
 
-- Laravel 11 support (#504)
-
-## [2.4.1](https://github.com/rapidez/core/releases/tag/2.4.1) - 2024-05-22
-
+- Laravel 11 support (#504)
+
+## [2.4.1](https://github.com/rapidez/core/releases/tag/2.4.1) - 2024-05-22
+
 ### Fixed
 
 - Revert "Rearranged the button classes (#460)" (#499)
 - Round prices before multiplying by qty (#480)
 - Sort images in gallery by position in Magento (#500)
 - Correct rapidez/menu config path location (8e67b22)
-- Check correct customer id when jwt is used (#502)
-
-## [2.4.0](https://github.com/rapidez/core/releases/tag/2.4.0) - 2024-05-15
-
+- Check correct customer id when jwt is used (#502)
+
+## [2.4.0](https://github.com/rapidez/core/releases/tag/2.4.0) - 2024-05-15
+
 ### Added
 
 - Macroable models (#483)
@@ -648,10 +654,10 @@ See the upgrade guide: https://docs.rapidez.io/3.x/upgrading.html
 - Use Rapidez base model for all models (#488)
 - Also save product views in the report_event table (#490)
 - Prevent ambiguous error when overwriting models (#498)
-- Don't use global scopes for quote existence check (#493)
-
-## [2.3.0](https://github.com/rapidez/core/releases/tag/2.3.0) - 2024-04-30
-
+- Don't use global scopes for quote existence check (#493)
+
+## [2.3.0](https://github.com/rapidez/core/releases/tag/2.3.0) - 2024-04-30
+
 ### Changed
 
 - Use script to get the positions from the flattened type (#459)
@@ -662,10 +668,10 @@ See the upgrade guide: https://docs.rapidez.io/3.x/upgrading.html
 - Fixes for swatch filter (#477)
 - Allow dataFilter null in the indexer (#470)
 - Correct key in autocomplete products loop (#465)
-- Only allow certain types to be searchable in autocomplete (#476)
-
-## [2.2.0](https://github.com/rapidez/core/releases/tag/2.2.0) - 2024-04-16
-
+- Only allow certain types to be searchable in autocomplete (#476)
+
+## [2.2.0](https://github.com/rapidez/core/releases/tag/2.2.0) - 2024-04-16
+
 ### Added
 
 - Fire postcode change event in checkout (#447)
@@ -682,10 +688,10 @@ See the upgrade guide: https://docs.rapidez.io/3.x/upgrading.html
 
 ### Removed
 
-- Remove unnecessary toArray calls in product indexer (#471)
-
-## [2.1.0](https://github.com/rapidez/core/releases/tag/2.1.0) - 2024-03-06
-
+- Remove unnecessary toArray calls in product indexer (#471)
+
+## [2.1.0](https://github.com/rapidez/core/releases/tag/2.1.0) - 2024-03-06
+
 ### Changed
 
 - Use ReactiveSearch fork with fixes (#435)
@@ -699,10 +705,10 @@ See the upgrade guide: https://docs.rapidez.io/3.x/upgrading.html
 - Fallback on default checkout_steps (#439)
 - Send full address to check shipping methods (#441)
 - Cache yarn dependencies with Dusk tests (#442)
-- Move resizeobserver to nextTick function (#444)
-
-## [2.0.0](https://github.com/rapidez/core/releases/tag/2.0.0) - 2024-02-21
-
+- Move resizeobserver to nextTick function (#444)
+
+## [2.0.0](https://github.com/rapidez/core/releases/tag/2.0.0) - 2024-02-21
+
 In this release we refactored the cart from the Magento API to GraphQL! You should review all changes!
 - Dropped support for Magento 2.4.4, Laravel 9 and PHP 8.0
 - Axios is removed and you should remove it from your project and migrate to fetch, we've added some helpers you could use:
@@ -727,10 +733,10 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 
 ### Fixed
 
-- Properly set slide behavior in slider (#430)
-
-## [1.13.0](https://github.com/rapidez/core/releases/tag/1.13.0) - 2024-02-20
-
+- Properly set slide behavior in slider (#430)
+
+## [1.13.0](https://github.com/rapidez/core/releases/tag/1.13.0) - 2024-02-20
+
 ### Changed
 
 - Upgrade Turbo for link preloading, show progressbar quicker (#426)
@@ -738,10 +744,10 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 ### Fixed
 
 - Clear swatches & attributes on store change (#424)
-- Use hasAny in button base Blade component (#425)
-
-## [1.12.0](https://github.com/rapidez/core/releases/tag/1.12.0) - 2024-02-16
-
+- Use hasAny in button base Blade component (#425)
+
+## [1.12.0](https://github.com/rapidez/core/releases/tag/1.12.0) - 2024-02-16
+
 ### Added
 
 - Catalog urls for products and categories (#419)
@@ -749,32 +755,32 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 
 ### Changed
 
-- Removed hardcoded checkout step numbers (#420)
-
-## [1.11.0](https://github.com/rapidez/core/releases/tag/1.11.0) - 2024-02-05
-
+- Removed hardcoded checkout step numbers (#420)
+
+## [1.11.0](https://github.com/rapidez/core/releases/tag/1.11.0) - 2024-02-05
+
 ### Changed
 
 - Make positions flattened (#415)
 - Use lowercase & asciifolding filters in default analyzer & in synonym analyzer (#416)
 - Seperate check whether flat tables are active, and if they exist (#413)
-
-
-## [1.10.2](https://github.com/rapidez/core/releases/tag/1.10.2) - 2024-01-31
-
+
+
+## [1.10.2](https://github.com/rapidez/core/releases/tag/1.10.2) - 2024-01-31
+
 ### Fixed
 
  - Watch currentShippingMethod instead of shipping_method (#414)
-
-
-## [1.10.1](https://github.com/rapidez/core/releases/tag/1.10.1) - 2024-01-30
-
+
+
+## [1.10.1](https://github.com/rapidez/core/releases/tag/1.10.1) - 2024-01-30
+
 ### Fixed
 
- - Fix slot scope "limit" to "size" (#412)
-
-## [1.10.0](https://github.com/rapidez/core/releases/tag/1.10.0) - 2024-01-29
-
+ - Fix slot scope "limit" to "size" (#412)
+
+## [1.10.0](https://github.com/rapidez/core/releases/tag/1.10.0) - 2024-01-29
+
 ### Added
 
  - Add new storecode if directive (#411)
@@ -789,16 +795,16 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 ### Fixed
 
  - Fix usage of whitespace tokenizer (#410)
-
-
-## [1.9.0](https://github.com/rapidez/core/releases/tag/1.9.0) - 2024-01-24
-
+
+
+## [1.9.0](https://github.com/rapidez/core/releases/tag/1.9.0) - 2024-01-24
+
 ### Changed
 
-- Use the configured locale from Magento (#409)
-
-## [1.8.0](https://github.com/rapidez/core/releases/tag/1.8.0) - 2024-01-23
-
+- Use the configured locale from Magento (#409)
+
+## [1.8.0](https://github.com/rapidez/core/releases/tag/1.8.0) - 2024-01-23
+
 ### Added
 
 - New payment events (#406)
@@ -807,16 +813,16 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 ### Fixed
 
 - Use stores to get the token and mask on checkout success (#377)
-- Fix dusk tests (#405)
-
-## [1.7.1](https://github.com/rapidez/core/releases/tag/1.7.1) - 2024-01-05
-
+- Fix dusk tests (#405)
+
+## [1.7.1](https://github.com/rapidez/core/releases/tag/1.7.1) - 2024-01-05
+
 ### Fixed
 
-- Exclude register themes when running from console (#401)
-
-## [1.7.0](https://github.com/rapidez/core/releases/tag/1.7.0) - 2024-01-04
-
+- Exclude register themes when running from console (#401)
+
+## [1.7.0](https://github.com/rapidez/core/releases/tag/1.7.0) - 2024-01-04
+
 ### Added
 
 - Payment icons (#374)
@@ -826,16 +832,16 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 
 ### Fixed
 
-- Trigger mounted event for autocomplete to remove timing dependency (#395)
-
-## [1.6.1](https://github.com/rapidez/core/releases/tag/1.6.1) - 2023-12-08
-
+- Trigger mounted event for autocomplete to remove timing dependency (#395)
+
+## [1.6.1](https://github.com/rapidez/core/releases/tag/1.6.1) - 2023-12-08
+
 ### Fixed
 
-- Use configured category model for subcategories (#396)
-
-## [1.6.0](https://github.com/rapidez/core/releases/tag/1.6.0) - 2023-12-07
-
+- Use configured category model for subcategories (#396)
+
+## [1.6.0](https://github.com/rapidez/core/releases/tag/1.6.0) - 2023-12-07
+
 ### Added
 
 - Store code route middleware (#394)
@@ -843,10 +849,10 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 ### Fixed
 
 - Correct cross-sells field (#392)
-- Only add super attributes if they're also in the flat table (#393)
-
-## [1.5.0](https://github.com/rapidez/core/releases/tag/1.5.0) - 2023-12-05
-
+- Only add super attributes if they're also in the flat table (#393)
+
+## [1.5.0](https://github.com/rapidez/core/releases/tag/1.5.0) - 2023-12-05
+
 ### Added
 
 - Search synonyms support (#387)
@@ -854,18 +860,18 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 ### Fixed
 
 - Turbo update and workaround for 404 pages (#388)
-- Fix slider reactivity when resized (#349)
-
-## [1.4.1](https://github.com/rapidez/core/releases/tag/1.4.1) - 2023-11-24
-
+- Fix slider reactivity when resized (#349)
+
+## [1.4.1](https://github.com/rapidez/core/releases/tag/1.4.1) - 2023-11-24
+
 ### Fixed
 
 - Swatches fetch loop bug (#385)
 - Improve slider performance (#384)
-- Throw exception when the store is not found (#386)
-
-## [1.4.0](https://github.com/rapidez/core/releases/tag/1.4.0) - 2023-11-22
-
+- Throw exception when the store is not found (#386)
+
+## [1.4.0](https://github.com/rapidez/core/releases/tag/1.4.0) - 2023-11-22
+
 ### Added
 
 - Support for image disabled option (#381)
@@ -873,36 +879,36 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 
 ### Fixed
 
-- Clear cart storage when not found (#383)
-
-## [1.3.0](https://github.com/rapidez/core/releases/tag/1.3.0) - 2023-11-14
-
+- Clear cart storage when not found (#383)
+
+## [1.3.0](https://github.com/rapidez/core/releases/tag/1.3.0) - 2023-11-14
+
 ### Added
 
 - Added special price and priceValidUntil to microdata (#380)
 
 ### Fixed
 
-- Support MSP way of saving method_title (#379)
-
-## [1.2.0](https://github.com/rapidez/core/releases/tag/1.2.0) - 2023-11-07
-
+- Support MSP way of saving method_title (#379)
+
+## [1.2.0](https://github.com/rapidez/core/releases/tag/1.2.0) - 2023-11-07
+
 ### Added
 
 - Implemented customer address prefix, suffix, vat_id and fax (#373)
 
 ### Fixed
 
-- Use new config path (#375)
-
-## [1.1.0](https://github.com/rapidez/core/releases/tag/1.1.0) - 2023-11-03
-
+- Use new config path (#375)
+
+## [1.1.0](https://github.com/rapidez/core/releases/tag/1.1.0) - 2023-11-03
+
 ### Changed
 
-- Indexer config with visibility option (#369)
-
-## [1.0.1](https://github.com/rapidez/core/releases/tag/1.0.1) - 2023-11-01
-
+- Indexer config with visibility option (#369)
+
+## [1.0.1](https://github.com/rapidez/core/releases/tag/1.0.1) - 2023-11-01
+
 ### Fixed
 
 - Avoid error in console (#365)
@@ -910,10 +916,10 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 - Remove old button component (#367)
 - Use dragOnClick and disable keyboard for the price filter (#368)
 - Use data_get to allow both stdClass & arrays to be used (#370)
-- Update prices when super attribute option is changed (#371)
-
-## [1.0.0](https://github.com/rapidez/core/releases/tag/1.0.0) - 2023-10-19
-
+- Update prices when super attribute option is changed (#371)
+
+## [1.0.0](https://github.com/rapidez/core/releases/tag/1.0.0) - 2023-10-19
+
 ### Added
 
 - Improved frontend (#307, #359)
@@ -949,10 +955,10 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 - Wrap raw query parts (#352)
 - Make slidesTotal a computed property (#346)
 - Passive listeners and key instead of keyCode in product image component (#350)
-- Translatable cart + checkout title (7a6c533, 2a68e8b)
-
-## [0.81.0](https://github.com/rapidez/core/releases/tag/0.81.0) - 2023-02-21
-
+- Translatable cart + checkout title (7a6c533, 2a68e8b)
+
+## [0.81.0](https://github.com/rapidez/core/releases/tag/0.81.0) - 2023-02-21
+
 ### Added
 
 - Expose logout slot from login component (#216)
@@ -963,39 +969,39 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 
 ### Fixed
 
-- Catch exceptions resembling 404 (#212)
-
-## [0.80.1](https://github.com/rapidez/core/releases/tag/0.80.1) - 2023-02-17
-
+- Catch exceptions resembling 404 (#212)
+
+## [0.80.1](https://github.com/rapidez/core/releases/tag/0.80.1) - 2023-02-17
+
 ### Fixed
 
-- Do not trigger the logout event when there is no token (cb72bb8)
-
-## [0.80.0](https://github.com/rapidez/core/releases/tag/0.80.0) - 2023-02-16
-
+- Do not trigger the logout event when there is no token (cb72bb8)
+
+## [0.80.0](https://github.com/rapidez/core/releases/tag/0.80.0) - 2023-02-16
+
 ### Added
 
 - Ability to remove fallback routes (#206)
 
 ### Fixed
 
-- Logout completely when user refresh fails due a 401 (621501f)
-
-## [0.79.2](https://github.com/rapidez/core/releases/tag/0.79.2) - 2023-02-01
-
+- Logout completely when user refresh fails due a 401 (621501f)
+
+## [0.79.2](https://github.com/rapidez/core/releases/tag/0.79.2) - 2023-02-01
+
 ### Fixed
 
-- Replaced old helper with facade (35b545a)
-
-## [0.79.1](https://github.com/rapidez/core/releases/tag/0.79.1) - 2023-02-01
-
+- Replaced old helper with facade (35b545a)
+
+## [0.79.1](https://github.com/rapidez/core/releases/tag/0.79.1) - 2023-02-01
+
 ### Fixed
 
 - Improved Dusk tests (#201)
-- Raise Dusk test default idle timeout to 2 minutes (#205)
-
-## [0.79.0](https://github.com/rapidez/core/releases/tag/0.79.0) - 2023-01-31
-
+- Raise Dusk test default idle timeout to 2 minutes (#205)
+
+## [0.79.0](https://github.com/rapidez/core/releases/tag/0.79.0) - 2023-01-31
+
 ### Changed
 
 - Vue 2.7 update (#202)
@@ -1004,16 +1010,16 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 
 - Load Vue as ES Module (94fa925)
 - Replaced deprecated Turbo.clearCache (a8740d9)
-- Prevent full page reload when navigating from listing (#200)
-
-## [0.78.0](https://github.com/rapidez/core/releases/tag/0.78.0) - 2023-01-20
-
+- Prevent full page reload when navigating from listing (#200)
+
+## [0.78.0](https://github.com/rapidez/core/releases/tag/0.78.0) - 2023-01-20
+
 ### Changed
 
-- Renamed subcategories and added subcategories (#187)
-
-## [0.77.0](https://github.com/rapidez/core/releases/tag/0.77.0) - 2023-01-18
-
+- Renamed subcategories and added subcategories (#187)
+
+## [0.77.0](https://github.com/rapidez/core/releases/tag/0.77.0) - 2023-01-18
+
 ### Added
 
 - Log notifications if debug mode is on (#186)
@@ -1025,51 +1031,51 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 
 ### Fixed
 
-- Browser test fixes (#181)
-
-## [0.76.4](https://github.com/rapidez/core/releases/tag/0.76.4) - 2023-01-10
-
+- Browser test fixes (#181)
+
+## [0.76.4](https://github.com/rapidez/core/releases/tag/0.76.4) - 2023-01-10
+
 ### Fixed
 
-- Bugfix (d947dd9)
-
-## [0.76.3](https://github.com/rapidez/core/releases/tag/0.76.3) - 2023-01-10
-
+- Bugfix (d947dd9)
+
+## [0.76.3](https://github.com/rapidez/core/releases/tag/0.76.3) - 2023-01-10
+
 ### Fixed
 
-- Get the attributes values for non-swatch super attributes (6c406a2, 8ed98ad)
-
-## [0.76.2](https://github.com/rapidez/core/releases/tag/0.76.2) - 2023-01-06
-
+- Get the attributes values for non-swatch super attributes (6c406a2, 8ed98ad)
+
+## [0.76.2](https://github.com/rapidez/core/releases/tag/0.76.2) - 2023-01-06
+
 ### Fixed
 
-- Select meta description with categories (1a11268)
-
-## [0.76.1](https://github.com/rapidez/core/releases/tag/0.76.1) - 2023-01-03
-
+- Select meta description with categories (1a11268)
+
+## [0.76.1](https://github.com/rapidez/core/releases/tag/0.76.1) - 2023-01-03
+
 ### Fixed
 
 - `custom_attributes` in address data (#177)
-- Fix key must be object if mappings or settings are empty (#180)
-
-## [0.76.0](https://github.com/rapidez/core/releases/tag/0.76.0) - 2022-12-14
-
+- Fix key must be object if mappings or settings are empty (#180)
+
+## [0.76.0](https://github.com/rapidez/core/releases/tag/0.76.0) - 2022-12-14
+
 ### Added
 
 - Eventy product index settings filter (a172022)
 
 ### Changed
 
-- Removed Magento 2.4.2 and 2.4.3 support (6994db0)
-
-## [0.75.0](https://github.com/rapidez/core/releases/tag/0.75.0) - 2022-12-02
-
+- Removed Magento 2.4.2 and 2.4.3 support (6994db0)
+
+## [0.75.0](https://github.com/rapidez/core/releases/tag/0.75.0) - 2022-12-02
+
 ### Changed
 
-- Migrated from Laravel Mix to Vite (#172)
-
-## [0.74.0](https://github.com/rapidez/core/releases/tag/0.74.0) - 2022-11-17
-
+- Migrated from Laravel Mix to Vite (#172)
+
+## [0.74.0](https://github.com/rapidez/core/releases/tag/0.74.0) - 2022-11-17
+
 ### Added
 
 - Add option to allow vertical slides (#168)
@@ -1083,16 +1089,16 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 ### Fixed
 
 - Fix ambiguous column (#170)
-- Reindex url error fix (fbe1f32)
-
-## [0.73.0](https://github.com/rapidez/core/releases/tag/0.73.0) - 2022-10-27
-
+- Reindex url error fix (fbe1f32)
+
+## [0.73.0](https://github.com/rapidez/core/releases/tag/0.73.0) - 2022-10-27
+
 ### Changed
 
-- Always add a canonical with the current url without query strings (c03d794)
-
-## [0.72.0](https://github.com/rapidez/core/releases/tag/0.72.0) - 2022-10-27
-
+- Always add a canonical with the current url without query strings (c03d794)
+
+## [0.72.0](https://github.com/rapidez/core/releases/tag/0.72.0) - 2022-10-27
+
 ### Changed
 
 - Generalise scroll to, to allow arbitrary selectors (#159)
@@ -1101,69 +1107,69 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 ### Fixed
 
 - Fallback to using option code if its not an id (#163)
-- Fixed empty customer address error in the checkout (8322cc0)
-
-## [0.71.1](https://github.com/rapidez/core/releases/tag/0.71.1) - 2022-10-10
-
+- Fixed empty customer address error in the checkout (8322cc0)
+
+## [0.71.1](https://github.com/rapidez/core/releases/tag/0.71.1) - 2022-10-10
+
 ### Fixed
 
-- Install tests command fixes (b95b0aa)
-
-## [0.71.0](https://github.com/rapidez/core/releases/tag/0.71.0) - 2022-10-06
-
+- Install tests command fixes (b95b0aa)
+
+## [0.71.0](https://github.com/rapidez/core/releases/tag/0.71.0) - 2022-10-06
+
 ### Added
 
-- Install tests command (72da9c1)
-
-## [0.70.5](https://github.com/rapidez/core/releases/tag/0.70.5) - 2022-10-03
-
+- Install tests command (72da9c1)
+
+## [0.70.5](https://github.com/rapidez/core/releases/tag/0.70.5) - 2022-10-03
+
 #### Added
 
-- Added option to change store based on get param (#162)
-
-## [0.70.4](https://github.com/rapidez/core/releases/tag/0.70.4) - 2022-10-03
-
+- Added option to change store based on get param (#162)
+
+## [0.70.4](https://github.com/rapidez/core/releases/tag/0.70.4) - 2022-10-03
+
 ### Fixed
 
-- Get new shipping price on country change (#161)
-
-## [0.70.3](https://github.com/rapidez/core/releases/tag/0.70.3) - 2022-09-01
-
+- Get new shipping price on country change (#161)
+
+## [0.70.3](https://github.com/rapidez/core/releases/tag/0.70.3) - 2022-09-01
+
 ### Fixed
 
 - Make attribute_code more explicit (#155)
-- Fix for from/to dates special prices (#156)
-
-## [0.70.2](https://github.com/rapidez/core/releases/tag/0.70.2) - 2022-08-30
-
+- Fix for from/to dates special prices (#156)
+
+## [0.70.2](https://github.com/rapidez/core/releases/tag/0.70.2) - 2022-08-30
+
 ### Fixed
 
-- Search results page query fix (785daf4)
-
-## [0.70.1](https://github.com/rapidez/core/releases/tag/0.70.1) - 2022-08-24
-
+- Search results page query fix (785daf4)
+
+## [0.70.1](https://github.com/rapidez/core/releases/tag/0.70.1) - 2022-08-24
+
 ### Fixed
 
-- Send the store id when creating a customer (7c174e3)
-
-## [0.70.0](https://github.com/rapidez/core/releases/tag/0.70.0) - 2022-08-23
-
+- Send the store id when creating a customer (7c174e3)
+
+## [0.70.0](https://github.com/rapidez/core/releases/tag/0.70.0) - 2022-08-23
+
 ### Added
 
-- Save the website id in the config when indexing (c37d9ca)
-
-## [0.69.0](https://github.com/rapidez/core/releases/tag/0.69.0) - 2022-08-18
-
+- Save the website id in the config when indexing (c37d9ca)
+
+## [0.69.0](https://github.com/rapidez/core/releases/tag/0.69.0) - 2022-08-18
+
 ### Added
 
 - Graph Mutation component watch prop (18ff552)
 
 ### Fixed
 
-- Remove error parameters from successful response (#154)
-
-## [0.68.0](https://github.com/rapidez/core/releases/tag/0.68.0) - 2022-08-16
-
+- Remove error parameters from successful response (#154)
+
+## [0.68.0](https://github.com/rapidez/core/releases/tag/0.68.0) - 2022-08-16
+
 ### Added
 
 - Scroll to top when paginating (22257c8)
@@ -1172,10 +1178,10 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 ### Fixed
 
 - Added the peer dependencies (1c21335)
-- Removed old prop (8b57d7a)
-
-## [0.67.0](https://github.com/rapidez/core/releases/tag/0.67.0) - 2022-08-09
-
+- Removed old prop (8b57d7a)
+
+## [0.67.0](https://github.com/rapidez/core/releases/tag/0.67.0) - 2022-08-09
+
 ### Added
 
 - Min sale qty support (#148, #149)
@@ -1185,16 +1191,16 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 
 - Checkout steps fallback (#150)
 - Fixed console errors on category page (#152)
-- Change this. to window.app (#153)
-
-## [0.66.1](https://github.com/rapidez/core/releases/tag/0.66.1) - 2022-07-22
-
+- Change this. to window.app (#153)
+
+## [0.66.1](https://github.com/rapidez/core/releases/tag/0.66.1) - 2022-07-22
+
 ### Fixed
 
-- Honor the visibility attribute (#147)
-
-## [0.66.0](https://github.com/rapidez/core/releases/tag/0.66.0) - 2022-07-22
-
+- Honor the visibility attribute (#147)
+
+## [0.66.0](https://github.com/rapidez/core/releases/tag/0.66.0) - 2022-07-22
+
 ### Added
 
 - Added Vue cookies by default for the GTM package (264555d)
@@ -1203,30 +1209,30 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 
 ### Fixed
 
-- Index error fix (#146)
-
-## [0.65.3](https://github.com/rapidez/core/releases/tag/0.65.3) - 2022-07-20
-
+- Index error fix (#146)
+
+## [0.65.3](https://github.com/rapidez/core/releases/tag/0.65.3) - 2022-07-20
+
 ### Fixed
 
 - Category table prefix fix (9870520)
-- Console error fix (bab1ec2)
-
-## [0.65.2](https://github.com/rapidez/core/releases/tag/0.65.2) - 2022-07-20
-
+- Console error fix (bab1ec2)
+
+## [0.65.2](https://github.com/rapidez/core/releases/tag/0.65.2) - 2022-07-20
+
 ### Fixed
 
-- Category url from url rewrite table (5e0648e)
-
-## [0.65.1](https://github.com/rapidez/core/releases/tag/0.65.1) - 2022-07-18
-
+- Category url from url rewrite table (5e0648e)
+
+## [0.65.1](https://github.com/rapidez/core/releases/tag/0.65.1) - 2022-07-18
+
 ### Fixed
 
 - Expire cart for 404 addToCart response (#145)
-
-
-## [0.65.0](https://github.com/rapidez/core/releases/tag/0.65.0) - 2022-07-08
-
+
+
+## [0.65.0](https://github.com/rapidez/core/releases/tag/0.65.0) - 2022-07-08
+
 ### Changed
 
 - Checkout steps per store (#142)
@@ -1235,77 +1241,77 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 
 - Dusk tests fix (1133c93)
 - Fixed aria labels (#143)
-- Fix multiple reactive search requests (#144)
-
-## [0.64.2](https://github.com/rapidez/core/releases/tag/0.64.2) - 2022-06-28
-
+- Fix multiple reactive search requests (#144)
+
+## [0.64.2](https://github.com/rapidez/core/releases/tag/0.64.2) - 2022-06-28
+
 ### Fixed
 
-- Fallback fix when there are no children (53ece8b)
-
-## [0.64.1](https://github.com/rapidez/core/releases/tag/0.64.1) - 2022-06-24
-
+- Fallback fix when there are no children (53ece8b)
+
+## [0.64.1](https://github.com/rapidez/core/releases/tag/0.64.1) - 2022-06-24
+
 ### Fixed
 
-- Added fail safe if redirect type is not set (#140)
-
-## [0.64.0](https://github.com/rapidez/core/releases/tag/0.64.0) - 2022-06-24
-
+- Added fail safe if redirect type is not set (#140)
+
+## [0.64.0](https://github.com/rapidez/core/releases/tag/0.64.0) - 2022-06-24
+
 ### Added
 
-- GraphQL Mutation component mutating prop (#139)
-
-## [0.63.0](https://github.com/rapidez/core/releases/tag/0.63.0) - 2022-06-21
-
+- GraphQL Mutation component mutating prop (#139)
+
+## [0.63.0](https://github.com/rapidez/core/releases/tag/0.63.0) - 2022-06-21
+
 ### Added
 
 - Magento error params in error notifications (#138)
 
 ### Fixed
 
-- Table alias for on grouped scope (97d1a05)
-
-## [0.62.4](https://github.com/rapidez/core/releases/tag/0.62.4) - 2022-06-07
-
+- Table alias for on grouped scope (97d1a05)
+
+## [0.62.4](https://github.com/rapidez/core/releases/tag/0.62.4) - 2022-06-07
+
 ### Fixed
 
 - Fix return type (#137)
-- Use meta instead of link in microdata to prevent loading (8d0f572)
-
-## [0.62.3](https://github.com/rapidez/core/releases/tag/0.62.3) - 2022-06-03
-
+- Use meta instead of link in microdata to prevent loading (8d0f572)
+
+## [0.62.3](https://github.com/rapidez/core/releases/tag/0.62.3) - 2022-06-03
+
 ### Fixed
 
-- Coupon notifications (d1f745c)
-
-## [0.62.2](https://github.com/rapidez/core/releases/tag/0.62.2) - 2022-06-03
-
+- Coupon notifications (d1f745c)
+
+## [0.62.2](https://github.com/rapidez/core/releases/tag/0.62.2) - 2022-06-03
+
 ### Fixed
 
-- Notifications instead of alerts (4057543)
-
-## [0.62.1](https://github.com/rapidez/core/releases/tag/0.62.1) - 2022-06-01
-
+- Notifications instead of alerts (4057543)
+
+## [0.62.1](https://github.com/rapidez/core/releases/tag/0.62.1) - 2022-06-01
+
 ### Fixed
 
-- Per page config parse fix (#136)
-
-## [0.62.0](https://github.com/rapidez/core/releases/tag/0.62.0) - 2022-05-31
-
+- Per page config parse fix (#136)
+
+## [0.62.0](https://github.com/rapidez/core/releases/tag/0.62.0) - 2022-05-31
+
 ### Added
 
 - Results per page filter (#134)
-- Newest sort option and additionalSorting prop (#135)
-
-## [0.61.1](https://github.com/rapidez/core/releases/tag/0.61.1) - 2022-05-24
-
+- Newest sort option and additionalSorting prop (#135)
+
+## [0.61.1](https://github.com/rapidez/core/releases/tag/0.61.1) - 2022-05-24
+
 ### Fixed
 
 - Test against Magento 2.4.4 (934d84b)
-- Attribute cache per store (774101a)
-
-## [0.61.0](https://github.com/rapidez/core/releases/tag/0.61.0) - 2022-05-17
-
+- Attribute cache per store (774101a)
+
+## [0.61.0](https://github.com/rapidez/core/releases/tag/0.61.0) - 2022-05-17
+
 ### Added
 
 - Better search results and field weight support (41bbc68)
@@ -1314,41 +1320,41 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 
 ### Fixed
 
-- Extract JS chunks to the correct directory (6f4b967)
-
-## [0.60.1](https://github.com/rapidez/core/releases/tag/0.60.1) - 2022-05-10
-
+- Extract JS chunks to the correct directory (6f4b967)
+
+## [0.60.1](https://github.com/rapidez/core/releases/tag/0.60.1) - 2022-05-10
+
 ### Fixed
 
-- Swapping indexes without a mapping fix (#133)
-
-## [0.60.0](https://github.com/rapidez/core/releases/tag/0.60.0) - 2022-05-10
-
+- Swapping indexes without a mapping fix (#133)
+
+## [0.60.0](https://github.com/rapidez/core/releases/tag/0.60.0) - 2022-05-10
+
 ### Changed
 
-- Index command abstraction (#132)
-
-## [0.59.3](https://github.com/rapidez/core/releases/tag/0.59.3) - 2022-05-10
-
+- Index command abstraction (#132)
+
+## [0.59.3](https://github.com/rapidez/core/releases/tag/0.59.3) - 2022-05-10
+
 ### Fixed
 
 - Send Store header with GraphQL requests (#131)
-- Return false on non existing option values (7de6633)
-
-## [0.59.2](https://github.com/rapidez/core/releases/tag/0.59.2) - 2022-05-02
-
+- Return false on non existing option values (7de6633)
+
+## [0.59.2](https://github.com/rapidez/core/releases/tag/0.59.2) - 2022-05-02
+
 ### Fixed
 
-- Revert calling init immediately (db86662)
-
-## [0.59.1](https://github.com/rapidez/core/releases/tag/0.59.1) - 2022-04-28
-
+- Revert calling init immediately (db86662)
+
+## [0.59.1](https://github.com/rapidez/core/releases/tag/0.59.1) - 2022-04-28
+
 ### Fixed
 
-- Removed unneeded use (2d07b35)
-
-## [0.59.0](https://github.com/rapidez/core/releases/tag/0.59.0) - 2022-04-28
-
+- Removed unneeded use (2d07b35)
+
+## [0.59.0](https://github.com/rapidez/core/releases/tag/0.59.0) - 2022-04-28
+
 ### Added
 
 - GraphQL mutation beforeRequest prop (#130)
@@ -1356,10 +1362,10 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 
 ### Changed
 
-- Do not lazy load the first 4 images on categories (0bf6762)
-
-## [0.58.0](https://github.com/rapidez/core/releases/tag/0.58.0) - 2022-04-24
-
+- Do not lazy load the first 4 images on categories (0bf6762)
+
+## [0.58.0](https://github.com/rapidez/core/releases/tag/0.58.0) - 2022-04-24
+
 ### Changed
 
 - Use the Magento customer configuration (#127)
@@ -1367,48 +1373,48 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 
 ### Fixed
 
-- Slider scroll fix (5728dea)
-
-## [0.57.0](https://github.com/rapidez/core/releases/tag/0.57.0) - 2022-04-20
-
+- Slider scroll fix (5728dea)
+
+## [0.57.0](https://github.com/rapidez/core/releases/tag/0.57.0) - 2022-04-20
+
 ### Added
 
 - Category filter (#128)
 
 ### Changed
 
-- Added an additional wrapper div (a7fea71)
-
-## [0.56.2](https://github.com/rapidez/core/releases/tag/0.56.2) - 2022-04-15
-
+- Added an additional wrapper div (a7fea71)
+
+## [0.56.2](https://github.com/rapidez/core/releases/tag/0.56.2) - 2022-04-15
+
 ### Fixed
 
-- Emit event fix (1bfb884)
-
-## [0.56.1](https://github.com/rapidez/core/releases/tag/0.56.1) - 2022-04-14
-
+- Emit event fix (1bfb884)
+
+## [0.56.1](https://github.com/rapidez/core/releases/tag/0.56.1) - 2022-04-14
+
 ### Fixed
 
-- Encode search term in the url (0e44230)
-
-## [0.56.0](https://github.com/rapidez/core/releases/tag/0.56.0) - 2022-04-13
-
+- Encode search term in the url (0e44230)
+
+## [0.56.0](https://github.com/rapidez/core/releases/tag/0.56.0) - 2022-04-13
+
 ### Changed
 
 - Copied and renamed the lazy component and use requestIdleCallback (11cd9be)
 - Load lazy component automatically after 3 seconds instead of requestIdleCallback (3231f20)
 - Only load the user component when toggled (d7d6969, 380a23f)
 - Do not chunk the product image component (850ee34)
-- Only load the search autocomplete on focus (8067825)
-
-## [0.55.0](https://github.com/rapidez/core/releases/tag/0.55.0) - 2022-04-12
-
+- Only load the search autocomplete on focus (8067825)
+
+## [0.55.0](https://github.com/rapidez/core/releases/tag/0.55.0) - 2022-04-12
+
 ### Changed
 
-- Moved the facade (7373ab2)
-
-## [0.54.0](https://github.com/rapidez/core/releases/tag/0.54.0) - 2022-04-11
-
+- Moved the facade (7373ab2)
+
+## [0.54.0](https://github.com/rapidez/core/releases/tag/0.54.0) - 2022-04-11
+
 ### Changed
 
 - Laravel 9 upgrade (ba35831, 0075076)
@@ -1416,10 +1422,10 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 
 ### Fixed
 
-- Save grouped products as flattened in ES (#126)
-
-## [0.53.0](https://github.com/rapidez/core/releases/tag/0.53.0) - 2022-04-06
-
+- Save grouped products as flattened in ES (#126)
+
+## [0.53.0](https://github.com/rapidez/core/releases/tag/0.53.0) - 2022-04-06
+
 ### Added
 
 - Theme support (#122)
@@ -1430,74 +1436,74 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 
 ### Fixed
 
-- Cache busting for Webpack chunks (88f79aa)
-
-## [0.52.1](https://github.com/rapidez/core/releases/tag/0.52.1) - 2022-04-04
-
+- Cache busting for Webpack chunks (88f79aa)
+
+## [0.52.1](https://github.com/rapidez/core/releases/tag/0.52.1) - 2022-04-04
+
 ### Fixed
 
 - Better variable naming (2d981d2)
 - Use product model table everywhere (#124)
-- Special prices without dates fix (#125)
-
-## [0.52.0](https://github.com/rapidez/core/releases/tag/0.52.0) - 2022-03-29
-
+- Special prices without dates fix (#125)
+
+## [0.52.0](https://github.com/rapidez/core/releases/tag/0.52.0) - 2022-03-29
+
 ### Added
 
 - ViewOnly widget (#119)
-- Automatic changelog (#121)
-
-## [0.51.0](https://github.com/rapidez/core/releases/tag/0.51.0) - 2022-03-29
-
+- Automatic changelog (#121)
+
+## [0.51.0](https://github.com/rapidez/core/releases/tag/0.51.0) - 2022-03-29
+
 ### Added
 
 - Added callback in close function (#120)
 - Expose stock qty option (ccc1f51)
-- Website code availability in the config (034f491)
-
-## [0.50.0](https://github.com/rapidez/core/releases/tag/0.50.0) - 2022-03-25
-
+- Website code availability in the config (034f491)
+
+## [0.50.0](https://github.com/rapidez/core/releases/tag/0.50.0) - 2022-03-25
+
 ### Added
 
 - Grouped products support (615ce9c, 8a2d6da, 573b87a)
 
 ### Changed
 
-- Tailwind 3 upgrade (03735eb, d96206e)
-
-## [0.49.2](https://github.com/rapidez/core/releases/tag/0.49.2) - 2022-03-18
-
+- Tailwind 3 upgrade (03735eb, d96206e)
+
+## [0.49.2](https://github.com/rapidez/core/releases/tag/0.49.2) - 2022-03-18
+
 ### Fixed
 
-- Check on source_model to determine the right column (cbd708d)
-
-## [0.49.1](https://github.com/rapidez/core/releases/tag/0.49.1) - 2022-03-17
-
+- Check on source_model to determine the right column (cbd708d)
+
+## [0.49.1](https://github.com/rapidez/core/releases/tag/0.49.1) - 2022-03-17
+
 ### Fixed
 
-- Reset variables to initial variables on clear within GraphQL mutation (5f3e320)
-
-## [0.49.0](https://github.com/rapidez/core/releases/tag/0.49.0) - 2022-03-16
-
+- Reset variables to initial variables on clear within GraphQL mutation (5f3e320)
+
+## [0.49.0](https://github.com/rapidez/core/releases/tag/0.49.0) - 2022-03-16
+
 ### Changed
 
 - Move object key names in swatch to better clarify the functionality (#118)
-- Removed the changes GraphQL mutation option in favor of variables (3fbafed)
-
-## [0.48.2](https://github.com/rapidez/core/releases/tag/0.48.2) - 2022-03-15
-
+- Removed the changes GraphQL mutation option in favor of variables (3fbafed)
+
+## [0.48.2](https://github.com/rapidez/core/releases/tag/0.48.2) - 2022-03-15
+
 ### Fixed
 
-- Select the right column when the attribute type is a integer (e5262bf)
-
-## [0.48.1](https://github.com/rapidez/core/releases/tag/0.48.1) - 2022-03-14
-
+- Select the right column when the attribute type is a integer (e5262bf)
+
+## [0.48.1](https://github.com/rapidez/core/releases/tag/0.48.1) - 2022-03-14
+
 ### Fixed
 
-- Console error and swatches fix (#117)
-
-## [0.48.0](https://github.com/rapidez/core/releases/tag/0.48.0) - 2022-03-04
-
+- Console error and swatches fix (#117)
+
+## [0.48.0](https://github.com/rapidez/core/releases/tag/0.48.0) - 2022-03-04
+
 ### Changed
 
 - Javascript size improvements (#116)
@@ -1505,16 +1511,16 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 ### Fixed
 
 - Price slider fix (#115)
-- Sort attribute options (#113)
-
-## [0.47.1](https://github.com/rapidez/core/releases/tag/0.47.1) - 2022-03-02
-
+- Sort attribute options (#113)
+
+## [0.47.1](https://github.com/rapidez/core/releases/tag/0.47.1) - 2022-03-02
+
 ### Fixed
 
-- Cache the product model casts (7db518a)
-
-## [0.47.0](https://github.com/rapidez/core/releases/tag/0.47.0) - 2022-02-28
-
+- Cache the product model casts (7db518a)
+
+## [0.47.0](https://github.com/rapidez/core/releases/tag/0.47.0) - 2022-02-28
+
 ### Changed
 
 - Expose the getTotalsInformation method (ccf6c52)
@@ -1522,22 +1528,22 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 ### Fixed
 
 - Remove unneeded article tag (43b4fb2)
-- Raised the browser test wait times (994d4ca, 97ee47b)
-
-## [0.46.0](https://github.com/rapidez/core/releases/tag/0.46.0) - 2022-02-28
-
+- Raised the browser test wait times (994d4ca, 97ee47b)
+
+## [0.46.0](https://github.com/rapidez/core/releases/tag/0.46.0) - 2022-02-28
+
 ### Changed
 
-- Refresh totals on shipping method change (e66133a)
-
-## [0.45.0](https://github.com/rapidez/core/releases/tag/0.45.0) - 2022-02-25
-
+- Refresh totals on shipping method change (e66133a)
+
+## [0.45.0](https://github.com/rapidez/core/releases/tag/0.45.0) - 2022-02-25
+
 ### Added
 
-- Custom url rewrite support (af7d617)
-
-## [0.44.0](https://github.com/rapidez/core/releases/tag/0.44.0) - 2022-02-17
-
+- Custom url rewrite support (af7d617)
+
+## [0.44.0](https://github.com/rapidez/core/releases/tag/0.44.0) - 2022-02-17
+
 ### Added
 
 - Cart events (#107)
@@ -1552,228 +1558,228 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 ### Fixed
 
 - Remove created index in case of unsuccessful reindex (#112)
-- Corrected the logged in event order (15e7283)
-
-## [0.43.0](https://github.com/rapidez/core/releases/tag/0.43.0) - 2022-02-11
-
+- Corrected the logged in event order (15e7283)
+
+## [0.43.0](https://github.com/rapidez/core/releases/tag/0.43.0) - 2022-02-11
+
 ### Added
 
-- Logged in event (#108)
-
-## [0.42.0](https://github.com/rapidez/core/releases/tag/0.42.0) - 2022-02-09
-
+- Logged in event (#108)
+
+## [0.42.0](https://github.com/rapidez/core/releases/tag/0.42.0) - 2022-02-09
+
 ### Added
 
 - Checkout address select (91efbe4, e47e9ce)
 
 ### Changed
 
-- Logout event and clear addresses on logout (#105)
-
-## [0.41.0](https://github.com/rapidez/core/releases/tag/0.41.0) - 2022-02-09
-
+- Logout event and clear addresses on logout (#105)
+
+## [0.41.0](https://github.com/rapidez/core/releases/tag/0.41.0) - 2022-02-09
+
 ### Changed
 
 - Use primary key in the ForCurrentStoreScope (#104)
 - GraphQL component runQuery slot scope (#106)
-- Dynamic country with default country fallback (#100)
-
-## [0.40.0](https://github.com/rapidez/core/releases/tag/0.40.0) - 2022-02-05
-
+- Dynamic country with default country fallback (#100)
+
+## [0.40.0](https://github.com/rapidez/core/releases/tag/0.40.0) - 2022-02-05
+
 ### Added
 
-- Robots yield (#101)
-
-## [0.39.2](https://github.com/rapidez/core/releases/tag/0.39.2) - 2022-02-01
-
+- Robots yield (#101)
+
+## [0.39.2](https://github.com/rapidez/core/releases/tag/0.39.2) - 2022-02-01
+
 ### Fixed
 
-- Syntax error fix (becaece)
-
-## [0.39.1](https://github.com/rapidez/core/releases/tag/0.39.1) - 2022-01-31
-
+- Syntax error fix (becaece)
+
+## [0.39.1](https://github.com/rapidez/core/releases/tag/0.39.1) - 2022-01-31
+
 ### Fixed
 
 - Undefined request fix (c510cc7)
-- Recaptcha component location prop (9338284)
-
-## [0.39.0](https://github.com/rapidez/core/releases/tag/0.39.0) - 2022-01-28
-
+- Recaptcha component location prop (9338284)
+
+## [0.39.0](https://github.com/rapidez/core/releases/tag/0.39.0) - 2022-01-28
+
 ### Added
 
 - Custom sorting label translations possibility (#98)
-- Quote prices exclusive tax (1c6f885)
-
-## [0.38.1](https://github.com/rapidez/core/releases/tag/0.38.1) - 2022-01-18
-
+- Quote prices exclusive tax (1c6f885)
+
+## [0.38.1](https://github.com/rapidez/core/releases/tag/0.38.1) - 2022-01-18
+
 ### Fixed
 
-- Handle case when no category id's returned (#96)
-
-## [0.38.0](https://github.com/rapidez/core/releases/tag/0.38.0) - 2022-01-14
-
+- Handle case when no category id's returned (#96)
+
+## [0.38.0](https://github.com/rapidez/core/releases/tag/0.38.0) - 2022-01-14
+
 ### Added
 
 - Login component redirect prop (71617ae)
 
 ### Fixed
 
-- Eventy filters are applied correctly again (d2450e5)
-
-## [0.37.0](https://github.com/rapidez/core/releases/tag/0.37.0) - 2022-01-12
-
+- Eventy filters are applied correctly again (d2450e5)
+
+## [0.37.0](https://github.com/rapidez/core/releases/tag/0.37.0) - 2022-01-12
+
 ### Changed
 
-- Possibility to change the GraphQL data from the callback (3dfef56)
-
-## [0.36.0](https://github.com/rapidez/core/releases/tag/0.36.0) - 2022-01-11
-
+- Possibility to change the GraphQL data from the callback (3dfef56)
+
+## [0.36.0](https://github.com/rapidez/core/releases/tag/0.36.0) - 2022-01-11
+
 ### Changed
 
-- Productpage scopes filter, renamed the frontend attributes filter and small refactor (dbadbeb)
-
-## [0.35.0](https://github.com/rapidez/core/releases/tag/0.35.0) - 2022-01-11
-
+- Productpage scopes filter, renamed the frontend attributes filter and small refactor (dbadbeb)
+
+## [0.35.0](https://github.com/rapidez/core/releases/tag/0.35.0) - 2022-01-11
+
 ### Added
 
 - Recaptcha component (6868b63)
 
 ### Fixed
 
-- Price react to the new query filter (ac6b74e)
-
-## [0.34.0](https://github.com/rapidez/core/releases/tag/0.34.0) - 2022-01-04
-
+- Price react to the new query filter (ac6b74e)
+
+## [0.34.0](https://github.com/rapidez/core/releases/tag/0.34.0) - 2022-01-04
+
 ### Added
 
-- Quote items select Eventy filter (#95)
-
-## [0.33.0](https://github.com/rapidez/core/releases/tag/0.33.0) - 2022-01-04
-
+- Quote items select Eventy filter (#95)
+
+## [0.33.0](https://github.com/rapidez/core/releases/tag/0.33.0) - 2022-01-04
+
 ### Added
 
-- Expired cart check (6382c7e)
-
-## [0.32.1](https://github.com/rapidez/core/releases/tag/0.32.1) - 2021-12-22
-
+- Expired cart check (6382c7e)
+
+## [0.32.1](https://github.com/rapidez/core/releases/tag/0.32.1) - 2021-12-22
+
 ### Fixed
 
-- Filter widgets by their assigned store id (#94)
-
-## [0.32.0](https://github.com/rapidez/core/releases/tag/0.32.0) - 2021-12-16
-
+- Filter widgets by their assigned store id (#94)
+
+## [0.32.0](https://github.com/rapidez/core/releases/tag/0.32.0) - 2021-12-16
+
 ### Added
 
-- Add to cart callback prop (5710843)
-
-## [0.31.6](https://github.com/rapidez/core/releases/tag/0.31.6) - 2021-12-15
-
+- Add to cart callback prop (5710843)
+
+## [0.31.6](https://github.com/rapidez/core/releases/tag/0.31.6) - 2021-12-15
+
 ### Fixed
 
-- Round microdata prices (494a1c2)
-
-## [0.31.5](https://github.com/rapidez/core/releases/tag/0.31.5) - 2021-12-14
-
+- Round microdata prices (494a1c2)
+
+## [0.31.5](https://github.com/rapidez/core/releases/tag/0.31.5) - 2021-12-14
+
 ### Fixed
 
-- Use booting instead of booted in models (2dbb2b7)
-
-## [0.31.4](https://github.com/rapidez/core/releases/tag/0.31.4) - 2021-12-14
-
+- Use booting instead of booted in models (2dbb2b7)
+
+## [0.31.4](https://github.com/rapidez/core/releases/tag/0.31.4) - 2021-12-14
+
 ### Fixed
 
-- Override quote select fix (#93)
-
-## [0.31.3](https://github.com/rapidez/core/releases/tag/0.31.3) - 2021-12-14
-
+- Override quote select fix (#93)
+
+## [0.31.3](https://github.com/rapidez/core/releases/tag/0.31.3) - 2021-12-14
+
 ### Fixed
 
-- Prefix column with table to prevent ambiguous columns (#92)
-
-## [0.31.2](https://github.com/rapidez/core/releases/tag/0.31.2) - 2021-12-13
-
+- Prefix column with table to prevent ambiguous columns (#92)
+
+## [0.31.2](https://github.com/rapidez/core/releases/tag/0.31.2) - 2021-12-13
+
 ### Fixed
 
-- Keep the billing credentials in local storage (7fb81af)
-
-## [0.31.1](https://github.com/rapidez/core/releases/tag/0.31.1) - 2021-12-10
-
+- Keep the billing credentials in local storage (7fb81af)
+
+## [0.31.1](https://github.com/rapidez/core/releases/tag/0.31.1) - 2021-12-10
+
 ### Fixed
 
-- Return false instead of null in cache functions as null can not be cached (f8c56fe)
-
-## [0.31.0](https://github.com/rapidez/core/releases/tag/0.31.0) - 2021-12-10
-
+- Return false instead of null in cache functions as null can not be cached (f8c56fe)
+
+## [0.31.0](https://github.com/rapidez/core/releases/tag/0.31.0) - 2021-12-10
+
 ### Changed
 
-- Renamed qty prop to defaultQty (a541a96)
-
-## [0.30.4](https://github.com/rapidez/core/releases/tag/0.30.4) - 2021-12-09
-
+- Renamed qty prop to defaultQty (a541a96)
+
+## [0.30.4](https://github.com/rapidez/core/releases/tag/0.30.4) - 2021-12-09
+
 ### Fixed
 
-- Only use qty increments when it is enabled (f1a2356)
-
-## [0.30.3](https://github.com/rapidez/core/releases/tag/0.30.3) - 2021-12-03
-
+- Only use qty increments when it is enabled (f1a2356)
+
+## [0.30.3](https://github.com/rapidez/core/releases/tag/0.30.3) - 2021-12-03
+
 ### Fixed
 
-- Multiline widget parameter fix (7ae439e)
-
-## [0.30.2](https://github.com/rapidez/core/releases/tag/0.30.2) - 2021-12-02
-
+- Multiline widget parameter fix (7ae439e)
+
+## [0.30.2](https://github.com/rapidez/core/releases/tag/0.30.2) - 2021-12-02
+
 ### Fixed
 
-- Console error fix (da29a4e)
-
-## [0.30.1](https://github.com/rapidez/core/releases/tag/0.30.1) - 2021-12-01
-
+- Console error fix (da29a4e)
+
+## [0.30.1](https://github.com/rapidez/core/releases/tag/0.30.1) - 2021-12-01
+
 ### Fixed
 
-- Forgotten import (cdee1bb)
-
-## [0.30.0](https://github.com/rapidez/core/releases/tag/0.30.0) - 2021-12-01
-
+- Forgotten import (cdee1bb)
+
+## [0.30.0](https://github.com/rapidez/core/releases/tag/0.30.0) - 2021-12-01
+
 ### Added
 
-- Product children select Eventy filter (b94c3e7)
-
-## [0.29.0](https://github.com/rapidez/core/releases/tag/0.29.0) - 2021-11-30
-
+- Product children select Eventy filter (b94c3e7)
+
+## [0.29.0](https://github.com/rapidez/core/releases/tag/0.29.0) - 2021-11-30
+
 ### Added
 
 - Custom reactive prop (c3f29dc)
 
 ### Fixed
 
-- Only search when value is not empty (#90)
-
-## [0.28.0](https://github.com/rapidez/core/releases/tag/0.28.0) - 2021-11-25
-
+- Only search when value is not empty (#90)
+
+## [0.28.0](https://github.com/rapidez/core/releases/tag/0.28.0) - 2021-11-25
+
 ### Added
 
-- Toggler component callback prop (669d31b)
-
-## [0.27.0](https://github.com/rapidez/core/releases/tag/0.27.0) - 2021-11-25
-
+- Toggler component callback prop (669d31b)
+
+## [0.27.0](https://github.com/rapidez/core/releases/tag/0.27.0) - 2021-11-25
+
 ### Added
 
-- Cart refreshed event (d5bd9df)
-
-## [0.26.2](https://github.com/rapidez/core/releases/tag/0.26.2) - 2021-11-25
-
+- Cart refreshed event (d5bd9df)
+
+## [0.26.2](https://github.com/rapidez/core/releases/tag/0.26.2) - 2021-11-25
+
 ### Fixed
 
-- Discounts where not displayed (c878109)
-
-## [0.26.1](https://github.com/rapidez/core/releases/tag/0.26.1) - 2021-11-23
-
+- Discounts where not displayed (c878109)
+
+## [0.26.1](https://github.com/rapidez/core/releases/tag/0.26.1) - 2021-11-23
+
 ### Fixed
 
-- Do not try to decode the product children if it is already an object (93068df)
-
-## [0.26.0](https://github.com/rapidez/core/releases/tag/0.26.0) - 2021-11-23
-
+- Do not try to decode the product children if it is already an object (93068df)
+
+## [0.26.0](https://github.com/rapidez/core/releases/tag/0.26.0) - 2021-11-23
+
 ### Added
 
 - Implemented special prices (88333ae)
@@ -1783,38 +1789,38 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 
 - GraphQL mutation clear with variables (c872150)
 
-
-
-## [0.25.1](https://github.com/rapidez/core/releases/tag/0.25.1) - 2021-11-16
-
+
+
+## [0.25.1](https://github.com/rapidez/core/releases/tag/0.25.1) - 2021-11-16
+
 ### Fixed
 
-- Do not try to render non implemented widgets in production (7ddaf84)
-
-## [0.25.0](https://github.com/rapidez/core/releases/tag/0.25.0) - 2021-11-12
-
+- Do not try to render non implemented widgets in production (7ddaf84)
+
+## [0.25.0](https://github.com/rapidez/core/releases/tag/0.25.0) - 2021-11-12
+
 ### Added
 
-- Eventy filter for product attributes available in the frontend (#89)
-
-## [0.24.1](https://github.com/rapidez/core/releases/tag/0.24.1) - 2021-11-11
-
+- Eventy filter for product attributes available in the frontend (#89)
+
+## [0.24.1](https://github.com/rapidez/core/releases/tag/0.24.1) - 2021-11-11
+
 ### Fixed
 
-- Show shipping costs with tax (a98fe6f)
-
-## [0.24.0](https://github.com/rapidez/core/releases/tag/0.24.0) - 2021-11-11
-
+- Show shipping costs with tax (a98fe6f)
+
+## [0.24.0](https://github.com/rapidez/core/releases/tag/0.24.0) - 2021-11-11
+
 ### Added
 
 - Show shipping info in cart totals (5aa383e)
 
 ### Fixed
 
-- Only show tax in cart totals if present (affbce1)
-
-## [0.23.0](https://github.com/rapidez/core/releases/tag/0.23.0) - 2021-11-10
-
+- Only show tax in cart totals if present (affbce1)
+
+## [0.23.0](https://github.com/rapidez/core/releases/tag/0.23.0) - 2021-11-10
+
 ### Added
 
 - Configurable additional searchable attributes (80ec594)
@@ -1825,10 +1831,10 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 
 ### Fixed
 
-- Do not overwrite the category select query (230c87e)
-
-## [0.22.0](https://github.com/rapidez/core/releases/tag/0.22.0) - 2021-11-10
-
+- Do not overwrite the category select query (230c87e)
+
+## [0.22.0](https://github.com/rapidez/core/releases/tag/0.22.0) - 2021-11-10
+
 ### Added
 
 - Breadcrumb rich snippets (9f7ca61)
@@ -1836,28 +1842,28 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 
 ### Changed
 
-- Use more HTML5 semantic tags (16cc5ee)
-
-## [0.21.0](https://github.com/rapidez/core/releases/tag/0.21.0) - 2021-11-09
-
+- Use more HTML5 semantic tags (16cc5ee)
+
+## [0.21.0](https://github.com/rapidez/core/releases/tag/0.21.0) - 2021-11-09
+
 ### Changed
 
-- Refactored the product options in listings (860be53)
-
-## [0.20.1](https://github.com/rapidez/core/releases/tag/0.20.1) - 2021-11-04
-
+- Refactored the product options in listings (860be53)
+
+## [0.20.1](https://github.com/rapidez/core/releases/tag/0.20.1) - 2021-11-04
+
 ### Fixes
 
-- Product url access on product pages in js (#87)
-
-## [0.20.0](https://github.com/rapidez/core/releases/tag/0.20.0) - 2021-11-03
-
+- Product url access on product pages in js (#87)
+
+## [0.20.0](https://github.com/rapidez/core/releases/tag/0.20.0) - 2021-11-03
+
 ### Added
 
-- GraphQL callback prop (46dcc39)
-
-## [0.19.0](https://github.com/rapidez/core/releases/tag/0.19.0) - 2021-11-03
-
+- GraphQL callback prop (46dcc39)
+
+## [0.19.0](https://github.com/rapidez/core/releases/tag/0.19.0) - 2021-11-03
+
 ### Added
 
 - Notification duration prop (#85)
@@ -1865,10 +1871,10 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 
 ### Changed
 
-- Redirect with configurable products and disabled swatches in listings (#84)
-
-## [0.18.0](https://github.com/rapidez/core/releases/tag/0.18.0) - 2021-10-23
-
+- Redirect with configurable products and disabled swatches in listings (#84)
+
+## [0.18.0](https://github.com/rapidez/core/releases/tag/0.18.0) - 2021-10-23
+
 ### Added
 
 - Sensitive/encrypted config support (5def207)
@@ -1877,26 +1883,26 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 
 ### Fixed
 
-- Only show the page content heading when filled (bcf3fde)
-
-## [0.17.0](https://github.com/rapidez/core/releases/tag/0.17.0) - 2021-10-20
-
+- Only show the page content heading when filled (bcf3fde)
+
+## [0.17.0](https://github.com/rapidez/core/releases/tag/0.17.0) - 2021-10-20
+
 ### Added
 
-- Add to cart adding/added states and notify props (3d1b012, d367430)
-
-## [0.16.0](https://github.com/rapidez/core/releases/tag/0.16.0) - 2021-10-08
-
+- Add to cart adding/added states and notify props (3d1b012, d367430)
+
+## [0.16.0](https://github.com/rapidez/core/releases/tag/0.16.0) - 2021-10-08
+
 ### Added
 
 - GraphQL component prop to mutate on event (#80)
 
 ### Changed
 
-- Kebab-case events names (#81)
-
-## [0.15.2](https://github.com/rapidez/core/releases/tag/0.15.2) - 2021-10-07
-
+- Kebab-case events names (#81)
+
+## [0.15.2](https://github.com/rapidez/core/releases/tag/0.15.2) - 2021-10-07
+
 ### Changed
 
 - Allow post requests to the admin routes (6e91d62)
@@ -1904,39 +1910,39 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 ### Fixed
 
 - Slider totals fix (#78)
-- Spelling fix (#79)
-
-## [0.15.1](https://github.com/rapidez/core/releases/tag/0.15.1) - 2021-10-07
-
+- Spelling fix (#79)
+
+## [0.15.1](https://github.com/rapidez/core/releases/tag/0.15.1) - 2021-10-07
+
 ### Fixed
 
-- GraphQL Mutation component reactivity fix (092331a)
-
-## [0.15.0](https://github.com/rapidez/core/releases/tag/0.15.0) - 2021-10-05
-
+- GraphQL Mutation component reactivity fix (092331a)
+
+## [0.15.0](https://github.com/rapidez/core/releases/tag/0.15.0) - 2021-10-05
+
 ### Added
 
 - Configurable z-indexes (#76)
 
 ### Changed
 
-- Keep the email after the checkout and pass variables to GraphQL callbacks (#77)
-
-## [0.14.2](https://github.com/rapidez/core/releases/tag/0.14.2) - 2021-09-28
-
+- Keep the email after the checkout and pass variables to GraphQL callbacks (#77)
+
+## [0.14.2](https://github.com/rapidez/core/releases/tag/0.14.2) - 2021-09-28
+
 ### Added
 
-- Added the variables to the GraphQL mutation slot scope (#73)
-
-## [0.14.1](https://github.com/rapidez/core/releases/tag/0.14.1) - 2021-09-24
-
+- Added the variables to the GraphQL mutation slot scope (#73)
+
+## [0.14.1](https://github.com/rapidez/core/releases/tag/0.14.1) - 2021-09-24
+
 ### Fixed
 
 - Hide slider dots when there is just one slide (#70)
-- Clear cart on success page (#71)
-
-## [0.14.0](https://github.com/rapidez/core/releases/tag/0.14.0) - 2021-09-22
-
+- Clear cart on success page (#71)
+
+## [0.14.0](https://github.com/rapidez/core/releases/tag/0.14.0) - 2021-09-22
+
 ### Added
 
 - Slider navigation dots (#66)
@@ -1945,10 +1951,10 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 ### Changed
 
 - Expose the product id to the frontend (ab28cac)
-- Use localstorage email as guest email if available (#69)
-
-## [0.13.0](https://github.com/rapidez/core/releases/tag/0.13.0) - 2021-09-21
-
+- Use localstorage email as guest email if available (#69)
+
+## [0.13.0](https://github.com/rapidez/core/releases/tag/0.13.0) - 2021-09-21
+
 ### Added
 
 - Qty increments in the cart (6442c1c, 8036645)
@@ -1961,10 +1967,10 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 ### Fixed
 
 - Always refresh the cart after changes (174f473)
-- Resolve swatches anywhere (#68)
-
-## [0.12.0](https://github.com/rapidez/core/releases/tag/0.12.0) - 2021-09-16
-
+- Resolve swatches anywhere (#68)
+
+## [0.12.0](https://github.com/rapidez/core/releases/tag/0.12.0) - 2021-09-16
+
 ### Added
 
 - Variable disable when loading button option (6abaae4)
@@ -1973,10 +1979,10 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 
 - Allow Vue to set a href on an anchor button (6ccaefe)
 - Select filters do not react on themself and cleanup (bfbe4a7)
-- Always get the lowest price as base price (#65)
-
-## [0.11.0](https://github.com/rapidez/core/releases/tag/0.11.0) - 2021-09-10
-
+- Always get the lowest price as base price (#65)
+
+## [0.11.0](https://github.com/rapidez/core/releases/tag/0.11.0) - 2021-09-10
+
 ### Added
 
 - Aria labels (b410c22)
@@ -1992,48 +1998,48 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 
 ### Security
 
-- Updated lodash (60a68bf)
-
-## [0.10.1](https://github.com/rapidez/core/releases/tag/0.10.1) - 2021-09-07
-
+- Updated lodash (60a68bf)
+
+## [0.10.1](https://github.com/rapidez/core/releases/tag/0.10.1) - 2021-09-07
+
 ### Fixed
 
-- Fixed overwriting select (#62)
-
-## [0.10.0](https://github.com/rapidez/core/releases/tag/0.10.0) - 2021-09-01
-
+- Fixed overwriting select (#62)
+
+## [0.10.0](https://github.com/rapidez/core/releases/tag/0.10.0) - 2021-09-01
+
 ### Added
 
-- Widget replace option (9b986bc)
-
-## [0.9.3](https://github.com/rapidez/core/releases/tag/0.9.3) - 2021-09-01
-
+- Widget replace option (9b986bc)
+
+## [0.9.3](https://github.com/rapidez/core/releases/tag/0.9.3) - 2021-09-01
+
 ### Changed
 
-- Refresh cart totals when selecting a payment method (d4d8aaf, 8369ff0)
-
-## [0.9.2](https://github.com/rapidez/core/releases/tag/0.9.2) - 2021-08-31
-
+- Refresh cart totals when selecting a payment method (d4d8aaf, 8369ff0)
+
+## [0.9.2](https://github.com/rapidez/core/releases/tag/0.9.2) - 2021-08-31
+
 ### Changed
 
 - Test against Magento 2.4.2-p2 and 2.4.3 (465d430)
 - Use title from options for the productlist widget (276d739, 2fd56eb)
-- Use the button component for the slider buttons (9bb54e7)
-
-## [0.9.1](https://github.com/rapidez/core/releases/tag/0.9.1) - 2021-08-27
-
+- Use the button component for the slider buttons (9bb54e7)
+
+## [0.9.1](https://github.com/rapidez/core/releases/tag/0.9.1) - 2021-08-27
+
 ### Fixed
 
-- Productlist slider button position (48a3d15)
-
-## [0.9.0](https://github.com/rapidez/core/releases/tag/0.9.0) - 2021-08-27
-
+- Productlist slider button position (48a3d15)
+
+## [0.9.0](https://github.com/rapidez/core/releases/tag/0.9.0) - 2021-08-27
+
 ### Added
 
-- Productlist slider (96f3523, 8ea1d29)
-
-## [0.8.0](https://github.com/rapidez/core/releases/tag/0.8.0) - 2021-08-27
-
+- Productlist slider (96f3523, 8ea1d29)
+
+## [0.8.0](https://github.com/rapidez/core/releases/tag/0.8.0) - 2021-08-27
+
 ### Added
 
 - Toggler component open prop (#59)
@@ -2043,105 +2049,105 @@ In this release we refactored the cart from the Magento API to GraphQL! You shou
 ### Fixed
 
 - HasEventyGlobalScopeFilter trait boot method name (#61)
-- Productlist widget bugfix (269d886)
-
-## [0.7.0](https://github.com/rapidez/core/releases/tag/0.7.0) - 2021-08-24
-
+- Productlist widget bugfix (269d886)
+
+## [0.7.0](https://github.com/rapidez/core/releases/tag/0.7.0) - 2021-08-24
+
 ### Added
 
 - Configurable widgets (#57)
-- Content directive (edbf945)
-
-## [0.6.1](https://github.com/rapidez/core/releases/tag/0.6.1) - 2021-08-17
-
+- Content directive (edbf945)
+
+## [0.6.1](https://github.com/rapidez/core/releases/tag/0.6.1) - 2021-08-17
+
 ### Fixed
 
-- Product image thumbnail styling (2a34c4c)
-
-## [0.6.0](https://github.com/rapidez/core/releases/tag/0.6.0) - 2021-08-17
-
+- Product image thumbnail styling (2a34c4c)
+
+## [0.6.0](https://github.com/rapidez/core/releases/tag/0.6.0) - 2021-08-17
+
 ### Added
 
-- Product images carousel (91e4997)
-
-## [0.5.0](https://github.com/rapidez/core/releases/tag/0.5.0) - 2021-08-13
-
+- Product images carousel (91e4997)
+
+## [0.5.0](https://github.com/rapidez/core/releases/tag/0.5.0) - 2021-08-13
+
 ### Added
 
-- Breadcrumbs on products by latest category (647334e)
-
-## [0.4.0](https://github.com/rapidez/core/releases/tag/0.4.0) - 2021-08-13
-
+- Breadcrumbs on products by latest category (647334e)
+
+## [0.4.0](https://github.com/rapidez/core/releases/tag/0.4.0) - 2021-08-13
+
 ### Added
 
 - Breadcrumbs (5db2a36)
 
 ### Fixed
 
-- Prevent Vue warning (eb19308)
-
-## [0.3.2](https://github.com/rapidez/core/releases/tag/0.3.2) - 2021-08-12
-
+- Prevent Vue warning (eb19308)
+
+## [0.3.2](https://github.com/rapidez/core/releases/tag/0.3.2) - 2021-08-12
+
 ### Changed
 
-- Overwritable default qty and use the qty_increments (7ac384c)
-
-## [0.3.1](https://github.com/rapidez/core/releases/tag/0.3.1) - 2021-08-12
-
+- Overwritable default qty and use the qty_increments (7ac384c)
+
+## [0.3.1](https://github.com/rapidez/core/releases/tag/0.3.1) - 2021-08-12
+
 ### Changed
 
 - Possibility to use the refresh cart method without Vue (e37312e)
-- Pass through the Axios response with the GraphQL Mutation callback (3564519)
-
-## [0.3.0](https://github.com/rapidez/core/releases/tag/0.3.0) - 2021-08-10
-
+- Pass through the Axios response with the GraphQL Mutation callback (3564519)
+
+## [0.3.0](https://github.com/rapidez/core/releases/tag/0.3.0) - 2021-08-10
+
 ### Added
 
-- Product quantity increments (cf21993)
-
-## [0.2.2](https://github.com/rapidez/core/releases/tag/0.2.2) - 2021-08-07
-
+- Product quantity increments (cf21993)
+
+## [0.2.2](https://github.com/rapidez/core/releases/tag/0.2.2) - 2021-08-07
+
 ### Fixed
 
-- Typo (1a4de04)
-
-## [0.2.1](https://github.com/rapidez/core/releases/tag/0.2.1) - 2021-08-07
-
+- Typo (1a4de04)
+
+## [0.2.1](https://github.com/rapidez/core/releases/tag/0.2.1) - 2021-08-07
+
 ### Fixed
 
-- Only show discount when it is not 0 (1621edb)
-
-## [0.2.0](https://github.com/rapidez/core/releases/tag/0.2.0) - 2021-08-03
-
+- Only show discount when it is not 0 (1621edb)
+
+## [0.2.0](https://github.com/rapidez/core/releases/tag/0.2.0) - 2021-08-03
+
 ### Added
 
-- Configurable models (#56)
-
-## [0.1.4](https://github.com/rapidez/core/releases/tag/0.1.4) - 2021-07-20
-
+- Configurable models (#56)
+
+## [0.1.4](https://github.com/rapidez/core/releases/tag/0.1.4) - 2021-07-20
+
 ### Changed
 
-- Dynamic IsActiveScope column (4e97b21)
-
-## [0.1.3](https://github.com/rapidez/core/releases/tag/0.1.3) - 2021-07-19
-
+- Dynamic IsActiveScope column (4e97b21)
+
+## [0.1.3](https://github.com/rapidez/core/releases/tag/0.1.3) - 2021-07-19
+
 ### Changed
 
 - GraphQL mutation component callback prop (446d3c6)
-- Possiblity to use some methods without Vue (51d6b6b)
-
-## [0.1.2](https://github.com/rapidez/core/releases/tag/0.1.2) - 2021-07-08
-
-### Fixed
-
-- Image position fix (#52)
-
-## [0.1.1](https://github.com/rapidez/core/releases/tag/0.1.1) - 2021-07-07
-
-### Added
-- WebP images from rapidez/image-resizer with fallback (#51)
-
-## [0.1.0](https://github.com/rapidez/core/releases/tag/0.1.0) - 2021-06-23
-
-Public beta release!
-
+- Possiblity to use some methods without Vue (51d6b6b)
+
+## [0.1.2](https://github.com/rapidez/core/releases/tag/0.1.2) - 2021-07-08
+
+### Fixed
+
+- Image position fix (#52)
+
+## [0.1.1](https://github.com/rapidez/core/releases/tag/0.1.1) - 2021-07-07
+
+### Added
+- WebP images from rapidez/image-resizer with fallback (#51)
+
+## [0.1.0](https://github.com/rapidez/core/releases/tag/0.1.0) - 2021-06-23
+
+Public beta release!
+
diff --git a/config/rapidez/attribute-models.php b/config/rapidez/attribute-models.php
new file mode 100644
index 000000000..18c4e0252
--- /dev/null
+++ b/config/rapidez/attribute-models.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'Magento\Eav\Model\Entity\Attribute\Backend\ArrayBackend' => Rapidez\Core\Models\AttributeModels\ArrayBackend::class,
+];
diff --git a/config/rapidez/magento-defaults.php b/config/rapidez/magento-defaults.php
index b7843444c..a04a6935e 100644
--- a/config/rapidez/magento-defaults.php
+++ b/config/rapidez/magento-defaults.php
@@ -10,6 +10,9 @@
     'catalog/seo/category_url_suffix'                     => '.html',
     'catalog/seo/product_url_suffix'                      => '.html',
     'cataloginventory/item_options/backorders'            => '0',
+    'cataloginventory/item_options/min_sale_qty'          => '1',
+    'cataloginventory/item_options/max_sale_qty'          => '10000',
+    'cataloginventory/item_options/qty_increments'        => '1',
     'cataloginventory/options/show_out_of_stock'          => '0',
     'checkout/cart/redirect_to_cart'                      => '0',
     'checkout/options/guest_checkout'                     => '1',
diff --git a/config/rapidez/models.php b/config/rapidez/models.php
index 864efc62c..f5b6aef1d 100644
--- a/config/rapidez/models.php
+++ b/config/rapidez/models.php
@@ -2,41 +2,54 @@
 
 // The fully qualified class names of the models.
 return [
-    'page'                      => Rapidez\Core\Models\Page::class,
     'attribute'                 => Rapidez\Core\Models\Attribute::class,
-    'product'                   => Rapidez\Core\Models\Product::class,
+    'attribute_option'          => Rapidez\Core\Models\AttributeOption::class,
+    'attribute_datetime'        => Rapidez\Core\Models\AttributeDatetime::class,
+    'attribute_decimal'         => Rapidez\Core\Models\AttributeDecimal::class,
+    'attribute_int'             => Rapidez\Core\Models\AttributeInt::class,
+    'attribute_text'            => Rapidez\Core\Models\AttributeText::class,
+    'attribute_varchar'         => Rapidez\Core\Models\AttributeVarchar::class,
+    'block'                     => Rapidez\Core\Models\Block::class,
     'category'                  => Rapidez\Core\Models\Category::class,
-    'customer_group'            => Rapidez\Core\Models\CustomerGroup::class,
     'category_product'          => Rapidez\Core\Models\CategoryProduct::class,
     'customer'                  => Rapidez\Core\Models\Customer::class,
+    'customer_group'            => Rapidez\Core\Models\CustomerGroup::class,
     'config'                    => Rapidez\Core\Models\Config::class,
     'oauth_token'               => Rapidez\Core\Models\OauthToken::class,
     'option_swatch'             => Rapidez\Core\Models\OptionSwatch::class,
     'option_value'              => Rapidez\Core\Models\OptionValue::class,
+    'page'                      => Rapidez\Core\Models\Page::class,
+    'product'                   => Rapidez\Core\Models\Product::class,
     'product_image'             => Rapidez\Core\Models\ProductImage::class,
     'product_image_value'       => Rapidez\Core\Models\ProductImageValue::class,
     'product_link'              => Rapidez\Core\Models\ProductLink::class,
-    'product_view'              => Rapidez\Core\Models\ProductView::class,
     'product_option'            => Rapidez\Core\Models\ProductOption::class,
-    'product_option_title'      => Rapidez\Core\Models\ProductOptionTitle::class,
     'product_option_price'      => Rapidez\Core\Models\ProductOptionPrice::class,
-    'product_option_type_title' => Rapidez\Core\Models\ProductOptionTypeTitle::class,
+    'product_option_title'      => Rapidez\Core\Models\ProductOptionTitle::class,
     'product_option_type_price' => Rapidez\Core\Models\ProductOptionTypePrice::class,
+    'product_option_type_title' => Rapidez\Core\Models\ProductOptionTypeTitle::class,
     'product_option_type_value' => Rapidez\Core\Models\ProductOptionTypeValue::class,
-    'product_review_summary'    => Rapidez\Core\Models\ProductReviewSummary::class,
-    'quote'                     => Rapidez\Core\Models\Quote::class,
-    'quote_id_mask'             => Rapidez\Core\Models\QuoteIdMask::class,
-    'quote_item'                => Rapidez\Core\Models\QuoteItem::class,
-    'quote_item_option'         => Rapidez\Core\Models\QuoteItemOption::class,
-    'report_event'              => Rapidez\Core\Models\ReportEvent::class,
-    'rewrite'                   => Rapidez\Core\Models\Rewrite::class,
-    'store'                     => Rapidez\Core\Models\Store::class,
-    'widget'                    => Rapidez\Core\Models\Widget::class,
-    'block'                     => Rapidez\Core\Models\Block::class,
-    'sales_order'               => Rapidez\Core\Models\SalesOrder::class,
-    'sales_order_address'       => Rapidez\Core\Models\SalesOrderAddress::class,
-    'sales_order_item'          => Rapidez\Core\Models\SalesOrderItem::class,
-    'sales_order_payment'       => Rapidez\Core\Models\SalesOrderPayment::class,
-    'search_query'              => Rapidez\Core\Models\SearchQuery::class,
-    'search_synonym'            => Rapidez\Core\Models\SearchSynonym::class,
+    'product_price'             => Rapidez\Core\Models\ProductPrice::class,
+    // TODO: the naming is mixed..
+    'product_review'         => Rapidez\Core\Models\Review::class,
+    'product_review_summary' => Rapidez\Core\Models\ProductReviewSummary::class,
+    'product_stock'          => Rapidez\Core\Models\ProductStock::class,
+    'product_super_link'     => Rapidez\Core\Models\ProductSuperLink::class,
+    'product_tier_price'     => Rapidez\Core\Models\ProductTierPrice::class,
+    'product_view'           => Rapidez\Core\Models\ProductView::class,
+    'quote'                  => Rapidez\Core\Models\Quote::class,
+    'quote_id_mask'          => Rapidez\Core\Models\QuoteIdMask::class,
+    'quote_item'             => Rapidez\Core\Models\QuoteItem::class,
+    'quote_item_option'      => Rapidez\Core\Models\QuoteItemOption::class,
+    'report_event'           => Rapidez\Core\Models\ReportEvent::class,
+    'rewrite'                => Rapidez\Core\Models\Rewrite::class,
+    'sales_order'            => Rapidez\Core\Models\SalesOrder::class,
+    'sales_order_address'    => Rapidez\Core\Models\SalesOrderAddress::class,
+    'sales_order_item'       => Rapidez\Core\Models\SalesOrderItem::class,
+    'sales_order_payment'    => Rapidez\Core\Models\SalesOrderPayment::class,
+    'search_query'           => Rapidez\Core\Models\SearchQuery::class,
+    'search_synonym'         => Rapidez\Core\Models\SearchSynonym::class,
+    'store'                  => Rapidez\Core\Models\Store::class,
+    'super_attribute'        => Rapidez\Core\Models\SuperAttribute::class,
+    'widget'                 => Rapidez\Core\Models\Widget::class,
 ];
diff --git a/config/rapidez/searchkit.php b/config/rapidez/searchkit.php
index 86fb61d1c..ff7910702 100644
--- a/config/rapidez/searchkit.php
+++ b/config/rapidez/searchkit.php
@@ -29,6 +29,7 @@
         'url',
         'thumbnail',
         'in_stock',
+        'min_sale_qty',
         'children',
         'super_*',
         'reviews_count',
diff --git a/resources/js/components/Product/AddToCart.vue b/resources/js/components/Product/AddToCart.vue
index 0324edfd6..ee292cf96 100644
--- a/resources/js/components/Product/AddToCart.vue
+++ b/resources/js/components/Product/AddToCart.vue
@@ -297,7 +297,7 @@ export default {
             // Options per super attribute that match the given named refinements
             return Object.fromEntries(
                 Object.entries(this.product?.super_attributes || {}).map(([index, attribute]) => {
-                    let attributeValues = values.find(([key, value]) => key === attribute.code)?.[1] || []
+                    let attributeValues = values.find(([key, value]) => key === attribute.attribute_code)?.[1] || []
                     if (!Array.isArray(attributeValues)) {
                         attributeValues = [attributeValues]
                     }
@@ -339,7 +339,7 @@ export default {
             var simpleProducts = Object.values(product.children).filter((childProduct) => {
                 let isMatching = true
                 Object.entries(this.options).forEach(([attributeId, valueId]) => {
-                    var attributeCode = product.super_attributes[attributeId].code
+                    var attributeCode = product.super_attributes[attributeId].attribute_code
 
                     if (Number(childProduct[attributeCode]) !== Number(valueId)) {
                         isMatching = false
@@ -377,7 +377,7 @@ export default {
 
         productUrl: function () {
             let namedOptions = Object.fromEntries(
-                Object.entries(this.options).map(([key, value]) => [this.product.super_attributes[key]?.code, value]),
+                Object.entries(this.options).map(([key, value]) => [this.product.super_attributes[key]?.attribute_code, value]),
             )
 
             let params = new URLSearchParams(namedOptions)
@@ -410,23 +410,23 @@ export default {
             }
 
             Object.entries(this.product.super_attributes).forEach(([attributeId, attribute]) => {
-                disabledOptions['super_' + attribute.code] = []
+                disabledOptions['super_' + attribute.attribute_code] = []
                 valuesPerAttribute[attributeId] = {}
                 // Fill list with products per attribute value
                 Object.entries(this.product.children).forEach(([productId, option]) => {
-                    if (!valuesPerAttribute[attributeId][option[attribute.code]]) {
-                        valuesPerAttribute[attributeId][option[attribute.code]] = []
+                    if (!valuesPerAttribute[attributeId][option[attribute.attribute_code]]) {
+                        valuesPerAttribute[attributeId][option[attribute.attribute_code]] = []
                     }
 
                     if (!option.in_stock) {
                         if (Object.keys(this.product.super_attributes).length === 1) {
-                            disabledOptions['super_' + attribute.code].push(option[attribute.code])
+                            disabledOptions['super_' + attribute.attribute_code].push(option[attribute.attribute_code])
                         }
 
                         return
                     }
 
-                    valuesPerAttribute[attributeId][option[attribute.code]].push(productId)
+                    valuesPerAttribute[attributeId][option[attribute.attribute_code]].push(productId)
                 })
             })
 
@@ -437,7 +437,7 @@ export default {
                 Object.entries(valuesPerAttribute).forEach(([attributeId2, productsPerValue2]) => {
                     if (attributeId === attributeId2) return
                     var selectedValueId = this.options[attributeId]
-                    var attributeCode = this.product.super_attributes[attributeId2].code
+                    var attributeCode = this.product.super_attributes[attributeId2].attribute_code
 
                     Object.entries(productsPerValue2).forEach(([valueId, products]) => {
                         // If there is no product that intersects for this attribute value
@@ -465,10 +465,10 @@ export default {
                 valuesPerAttribute[attributeId] = []
                 // Fill list with products per attribute value
                 Object.entries(this.product.children).forEach(([productId, product]) => {
-                    if (!product.in_stock || this.disabledOptions['super_' + attribute.code].includes(product.value)) {
+                    if (!product.in_stock || this.disabledOptions['super_' + attribute.attribute_code].includes(product.value)) {
                         return
                     }
-                    valuesPerAttribute[attributeId].push(product[attribute.code])
+                    valuesPerAttribute[attributeId].push(product[attribute.attribute_code])
                 })
             })
             return valuesPerAttribute
diff --git a/resources/js/components/Product/Images.vue b/resources/js/components/Product/Images.vue
index 3318c00aa..4594fb4ed 100644
--- a/resources/js/components/Product/Images.vue
+++ b/resources/js/components/Product/Images.vue
@@ -27,7 +27,9 @@ export default {
             Object.values(window.config.product.children).forEach((child) => {
                 if (
                     child === simpleProduct &&
-                    Object.values(window.config.product.super_attributes).filter((attribute) => attribute.update_image).length
+                    Object.values(window.config.product.super_attributes).filter(
+                        (attribute) => attribute.additional_data.update_product_preview_image,
+                    ).length
                 ) {
                     self.images = simpleProduct.images
                     self.active = Math.min(self.active, self.images.length - 1)
diff --git a/resources/views/components/highlight.blade.php b/resources/views/components/highlight.blade.php
index cb7b9528e..343ede54d 100644
--- a/resources/views/components/highlight.blade.php
+++ b/resources/views/components/highlight.blade.php
@@ -6,6 +6,10 @@
         'attribute' => $attribute,
         'highlighted-tag-name' => $highlightTag,
     ]) }}></ais-highlight>
+    {{--
+    TODO: This doesn't render the HTML correctly
+    See: /gear/fitness-equipment.html
+    --}}
 @else
     <span {{ $attributes }} v-text="{{ $item }}.{{ $attribute }}"></span>
 @endif
diff --git a/resources/views/listing/partials/item/super-attributes.blade.php b/resources/views/listing/partials/item/super-attributes.blade.php
index 923cd40c7..9a38acc52 100644
--- a/resources/views/listing/partials/item/super-attributes.blade.php
+++ b/resources/views/listing/partials/item/super-attributes.blade.php
@@ -1,8 +1,8 @@
 <div v-for="(superAttribute, superAttributeId) in item.super_attributes" class="mt-2">
-    <template v-if="superAttribute.visual_swatch">
+    <template v-if="superAttribute.additional_data?.swatch_input_type === 'visual'">
         @include('rapidez::listing.partials.item.super-attributes.visual-swatch')
     </template>
-    <template v-else-if="superAttribute.text_swatch">
+    <template v-else-if="superAttribute.additional_data?.swatch_input_type === 'text'">
         @include('rapidez::listing.partials.item.super-attributes.text-swatch')
     </template>
     <template v-else>
diff --git a/resources/views/listing/partials/item/super-attributes/drop-down.blade.php b/resources/views/listing/partials/item/super-attributes/drop-down.blade.php
index d99b6152e..5e08b4660 100644
--- a/resources/views/listing/partials/item/super-attributes/drop-down.blade.php
+++ b/resources/views/listing/partials/item/super-attributes/drop-down.blade.php
@@ -1,6 +1,6 @@
 <label>
     <x-rapidez::label>
-        @{{ superAttribute.label }}
+        @{{ superAttribute.frontend_label }}
     </x-rapidez::label>
     <x-rapidez::input.select
         v-bind:name="superAttributeId"
@@ -8,13 +8,13 @@
         required
     >
         <option disabled selected hidden v-bind:value="undefined">
-            @lang('Select') @{{ superAttribute.label.toLowerCase() }}
+            @lang('Select') @{{ superAttribute.frontend_label.toLowerCase() }}
         </option>
         <option
-            v-for="(option, optionId) in addToCart.getOptions(superAttribute.code)"
+            v-for="(option, optionId) in addToCart.getOptions(superAttribute.attribute_code)"
             v-text="option.label"
             v-bind:value="optionId"
-            v-bind:disabled="addToCart.disabledOptions['super_'+superAttribute.code].includes(optionId)"
+            v-bind:disabled="addToCart.disabledOptions['super_'+superAttribute.attribute_code].includes(optionId)"
         />
     </x-rapidez::input.select>
 </label>
diff --git a/resources/views/listing/partials/item/super-attributes/text-swatch.blade.php b/resources/views/listing/partials/item/super-attributes/text-swatch.blade.php
index 710e52665..b505e6e91 100644
--- a/resources/views/listing/partials/item/super-attributes/text-swatch.blade.php
+++ b/resources/views/listing/partials/item/super-attributes/text-swatch.blade.php
@@ -1,16 +1,16 @@
 <div>
     <x-rapidez::label>
-        @{{ superAttribute.label }}
+        @{{ superAttribute.frontend_label }}
     </x-rapidez::label>
 
     <ul class="flex flex-wrap gap-x-1.5 gap-y-2 items-center pr-14">
-        <li v-for="(option, optionId) in addToCart.getOptions(superAttribute.code)">
+        <li v-for="(option, optionId) in addToCart.getOptions(superAttribute.attribute_code)">
             <x-rapidez::input.swatch.text
                 type="radio"
-                v-bind:name="superAttribute.code"
+                v-bind:name="superAttribute.attribute_code"
                 v-model="addToCart.options[superAttributeId]"
                 v-bind:value="option.value"
-                v-bind:disabled="addToCart.disabledOptions['super_' + superAttribute.code].includes(option.value)"
+                v-bind:disabled="addToCart.disabledOptions['super_' + superAttribute.attribute_code].includes(option.value)"
                 v-bind:aria-label="option.label"
                 v-bind:id="option.label"
                 required
diff --git a/resources/views/listing/partials/item/super-attributes/visual-swatch.blade.php b/resources/views/listing/partials/item/super-attributes/visual-swatch.blade.php
index a270f85c3..68355393c 100644
--- a/resources/views/listing/partials/item/super-attributes/visual-swatch.blade.php
+++ b/resources/views/listing/partials/item/super-attributes/visual-swatch.blade.php
@@ -1,19 +1,19 @@
 <div>
     <x-rapidez::label>
-        @{{ superAttribute.label }}
+        @{{ superAttribute.frontend_label }}
     </x-rapidez::label>
 
     <ul class="flex flex-wrap gap-x-1.5 gap-y-2 items-center pr-14">
-        <li v-for="(option, optionId) in addToCart.getOptions(superAttribute.code)">
+        <li v-for="(option, optionId) in addToCart.getOptions(superAttribute.attribute_code)">
             <x-rapidez::input.swatch.visual
                 type="radio"
-                v-bind:name="superAttribute.code"
+                v-bind:name="superAttribute.attribute_code"
                 v-model="addToCart.options[superAttributeId]"
                 v-bind:value="option.value"
-                v-bind:disabled="addToCart.disabledOptions['super_' + superAttribute.code].includes(option.value)"
+                v-bind:disabled="addToCart.disabledOptions['super_' + superAttribute.attribute_code].includes(option.value)"
                 v-bind:aria-label="option.label"
                 v-bind:id="option.label"
-                v-bind:color="window.config.swatches[superAttribute.code]?.options?.[option.value]?.swatch ?? 'none'"
+                v-bind:color="window.config.swatches[superAttribute.attribute_code]?.options?.[option.value]?.swatch ?? 'none'"
                 required
             >
                 @{{ option.label }}
diff --git a/resources/views/product/overview.blade.php b/resources/views/product/overview.blade.php
index 4419cfecf..9e9ed53bc 100644
--- a/resources/views/product/overview.blade.php
+++ b/resources/views/product/overview.blade.php
@@ -39,13 +39,14 @@
                             <dd>{{ $product->entity_id }}</dd>
                             <dt>SKU</dt>
                             <dd>{{ $product->sku }}</dd>
-                            @foreach (config('rapidez.models.attribute')::getCachedWhere(fn($a) => $a['productpage']) as $attribute)
-                                @if (($value = $product->{$attribute['code']}) && !is_object($value))
-                                    <dt>{{ $attribute['name'] }}</dt>
-                                    <dd>
-                                        @php $output = is_array($value) ? implode(', ', $value) : $value @endphp
-                                        {!! $attribute['html'] ? $output : e($output) !!}
-                                    </dd>
+                            @foreach (\Rapidez\Core\Models\EavAttribute::getCachedCatalog()->where(fn ($attribute) => $attribute->is_visible_on_front) as $attribute)
+                                @if (($value = $product->{$attribute['attribute_code']}))
+                                    <dt>{{ $attribute['frontend_label'] }}</dt>
+                                    @if ($attribute['is_html_allowed_on_front'])
+                                        <dd>{!! $value !!}</dd>
+                                    @else
+                                        <dd>{{ $value }}</dd>
+                                    @endif
                                 @endif
                             @endforeach
                         </dl>
diff --git a/resources/views/product/partials/super-attributes.blade.php b/resources/views/product/partials/super-attributes.blade.php
index 68958d6eb..c4fc604c9 100644
--- a/resources/views/product/partials/super-attributes.blade.php
+++ b/resources/views/product/partials/super-attributes.blade.php
@@ -1,7 +1,8 @@
-@foreach ($product->super_attributes ?: [] as $superAttributeId => $superAttribute)
-    @if ($superAttribute->visual_swatch)
+@foreach ($product->superAttributes ?: [] as $superAttributeId => $superAttribute)
+    @php($swatchType = $superAttribute->additional_data['swatch_input_type'] ?? null)
+    @if ($swatchType === 'visual')
         @include('rapidez::product.partials.super-attributes.visual-swatch')
-    @elseif ($superAttribute->text_swatch)
+    @elseif ($swatchType === 'text')
         @include('rapidez::product.partials.super-attributes.text-swatch')
     @else
         @include('rapidez::product.partials.super-attributes.drop-down')
diff --git a/resources/views/product/partials/super-attributes/drop-down.blade.php b/resources/views/product/partials/super-attributes/drop-down.blade.php
index 8ec6d9a62..10e9fefc4 100644
--- a/resources/views/product/partials/super-attributes/drop-down.blade.php
+++ b/resources/views/product/partials/super-attributes/drop-down.blade.php
@@ -1,6 +1,6 @@
 <label>
     <x-rapidez::label>
-        {{ $superAttribute->label }}
+        {{ $superAttribute->frontend_label }}
     </x-rapidez::label>
     <x-rapidez::input.select
         id="super_attribute_{{ $superAttributeId }}"
@@ -10,14 +10,14 @@ class="w-64"
         required
     >
         <option disabled selected hidden :value="undefined">
-            @lang('Select') {{ strtolower($superAttribute->label) }}
+            @lang('Select') {{ strtolower($superAttribute->frontend_label) }}
         </option>
-        @foreach ($product->{'super_' . $superAttribute->code} as $optionId => $option)
+        @foreach ($product->superAttributeValues[$superAttribute->attribute_code] as $option)
             <option
-                value="{{ $option->value }}"
-                :disabled="addToCart.disabledOptions.super_{{ $superAttribute->code }}.includes({{ $option->value }})"
+                value="{{ $option['value'] }}"
+                :disabled="addToCart.disabledOptions.super_{{ $superAttribute->attribute_code }}.includes({{ $option['value'] }})"
             >
-                {{ $option->label }}
+                {{ $option['label'] }}
             </option>
         @endforeach
     </x-rapidez::input.select>
diff --git a/resources/views/product/partials/super-attributes/text-swatch.blade.php b/resources/views/product/partials/super-attributes/text-swatch.blade.php
index f423e2c35..fa520cb04 100644
--- a/resources/views/product/partials/super-attributes/text-swatch.blade.php
+++ b/resources/views/product/partials/super-attributes/text-swatch.blade.php
@@ -1,22 +1,22 @@
 <div>
     <x-rapidez::label>
-        {{ $superAttribute->label }}
+        {{ $superAttribute->frontend_label }}
     </x-rapidez::label>
 
     <ul class="flex flex-wrap gap-x-1.5 gap-y-2 items-center pr-14">
-        @foreach ($product->{'super_' . $superAttribute->code} as $optionId => $option)
+        @foreach ($product->superAttributeValues[$superAttribute->attribute_code] as $option)
             <li>
                 <x-rapidez::input.swatch.text
                     type="radio"
-                    name="{{ $superAttribute->code }}"
+                    name="{{ $superAttribute->attribute_code }}"
                     v-model="addToCart.options[{{ $superAttributeId }}]"
-                    v-bind:disabled="addToCart.disabledOptions.super_{{ $superAttribute->code }}.includes({{ $option->value }})"
-                    :value="$option->value"
-                    :aria-label="$option->label"
-                    :id="$option->label"
+                    v-bind:disabled="addToCart.disabledOptions.super_{{ $superAttribute->attribute_code }}.includes({{ $option['value'] }})"
+                    :value="$option['value']"
+                    :aria-label="$option['label']"
+                    :id="$option['label']"
                     required
                 >
-                    {{ $option->label }}
+                    {{ $option['label'] }}
                 </x-rapidez::input.swatch.text>
             </li>
         @endforeach
diff --git a/resources/views/product/partials/super-attributes/visual-swatch.blade.php b/resources/views/product/partials/super-attributes/visual-swatch.blade.php
index dad8251ca..989c3b73d 100644
--- a/resources/views/product/partials/super-attributes/visual-swatch.blade.php
+++ b/resources/views/product/partials/super-attributes/visual-swatch.blade.php
@@ -1,23 +1,23 @@
 <div>
     <x-rapidez::label>
-        {{ $superAttribute->label }}
+        {{ $superAttribute->frontend_label }}
     </x-rapidez::label>
 
     <ul class="flex flex-wrap gap-x-1.5 gap-y-2 items-center pr-14">
-        @foreach ($product->{'super_' . $superAttribute->code} as $optionId => $option)
+        @foreach ($product->superAttributeValues[$superAttribute->attribute_code] as $option)
             <li>
                 <x-rapidez::input.swatch.visual
                     type="radio"
-                    name="{{ $superAttribute->code }}"
+                    name="{{ $superAttribute->attribute_code }}"
                     v-model="addToCart.options[{{ $superAttributeId }}]"
-                    v-bind:disabled="addToCart.disabledOptions.super_{{ $superAttribute->code }}.includes({{ $option->value }})"
-                    :value="$option->value"
-                    :aria-label="$option->label"
-                    :id="$option->label"
-                    :color="config('rapidez.models.option_swatch')::getCachedSwatchValue($superAttribute->code, $option->value)['swatch'] ?? 'none'"
+                    v-bind:disabled="addToCart.disabledOptions.super_{{ $superAttribute->attribute_code }}.includes({{ $option['value'] }})"
+                    :value="$option['value']"
+                    :aria-label="$option['label']"
+                    :id="$option['label']"
+                    :color="config('rapidez.models.option_swatch')::getCachedSwatchValue($superAttribute->attribute_code, $option['value'])['swatch'] ?? 'none'"
                     required
                 >
-                    {{ $option->label }}
+                    {{ $option['label'] }}
                 </x-rapidez::input.swatch.visual>
             </li>
         @endforeach
diff --git a/src/Http/Controllers/ProductController.php b/src/Http/Controllers/ProductController.php
index cc11e2460..6ed0d53ca 100644
--- a/src/Http/Controllers/ProductController.php
+++ b/src/Http/Controllers/ProductController.php
@@ -3,6 +3,7 @@
 namespace Rapidez\Core\Http\Controllers;
 
 use Rapidez\Core\Events\ProductViewEvent;
+use Rapidez\Core\Models\Product;
 use TorMorten\Eventy\Facades\Eventy;
 
 class ProductController
@@ -10,9 +11,13 @@ class ProductController
     public function show(int $productId)
     {
         $productModel = config('rapidez.models.product');
-        $product = $productModel::selectForProductPage()
-            ->withEventyGlobalScopes('productpage.scopes')
-            ->with('options')
+
+        /** @var \Rapidez\Core\Models\Product $product */
+        $product = $productModel::query()
+            ->whereInAttribute('visibility', [
+                Product::VISIBILITY_IN_CATALOG,
+                Product::VISIBILITY_BOTH,
+            ])
             ->findOrFail($productId);
 
         $attributes = [
@@ -27,33 +32,40 @@ public function show(int $productId)
             'special_price',
             'images',
             'url',
+            'in_stock',
             'min_sale_qty',
             'max_sale_qty',
             'qty_increments',
+            ...$product->superAttributes->pluck('attribute_code'),
         ];
 
-        $queryOptions = request()->query;
-        $selectedOptions = [];
-
         $attributes = Eventy::filter('productpage.frontend.attributes', $attributes);
 
-        foreach ($product->super_attributes ?: [] as $superAttributeId => $superAttribute) {
-            $attributes[] = 'super_' . $superAttribute->code;
+        // TODO: Make this neater so that we can maybe get this data from the product directly?
+        // Alternatively we can refactor the frontend to not need so much customized data
+        $data = $product->only($attributes);
+        foreach ($product->superAttributeValues as $attribute => $values) {
+            $data['super_' . $attribute] = $values->pluck('value');
+        }
+
+        $queryOptions = request()->query;
+        $selectedOptions = [];
 
+        foreach ($product->superAttributes ?: [] as $superAttributeId => $superAttribute) {
             // Make sure we only check for query options that exist
-            if ($queryOptions->has($superAttribute->code)) {
-                $selectedOptions[$superAttribute->code] = $queryOptions->get($superAttribute->code);
+            if ($queryOptions->has($superAttribute->attribute_code)) {
+                $selectedOptions[$superAttribute->attribute_code] = $queryOptions->get($superAttribute->attribute_code);
             }
         }
 
         // Find the first child that matches the given product options
-        $selectedChild = collect($product->children)->firstWhere(function ($child) use ($selectedOptions) {
+        $selectedChild = $product->children->firstWhere(function ($child) use ($selectedOptions) {
             return count($selectedOptions) && collect($selectedOptions)->every(fn ($value, $code) => $child->{$code} == $value);
         }) ?? $product;
 
         ProductViewEvent::dispatch($product);
 
-        config(['frontend.product' => $product->only($attributes)]);
+        config(['frontend.product' => $data]);
 
         $response = response()->view('rapidez::product.overview', compact('product', 'selectedChild'));
 
diff --git a/src/Models/AbstractAttribute.php b/src/Models/AbstractAttribute.php
new file mode 100644
index 000000000..e95239fa0
--- /dev/null
+++ b/src/Models/AbstractAttribute.php
@@ -0,0 +1,93 @@
+<?php
+
+namespace Rapidez\Core\Models;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Casts\Attribute;
+use Illuminate\Support\Arr;
+use Rapidez\Core\Models\Scopes\ForCurrentStoreWithoutLimitScope;
+
+class AbstractAttribute extends Model
+{
+    protected static function boot(): void
+    {
+        parent::boot();
+
+        static::addGlobalScope('store', new ForCurrentStoreWithoutLimitScope(['attribute_id', 'entity_id']));
+
+        static::addGlobalScope('attribute', function (Builder $builder) {
+            $builder->leftJoin('eav_attribute', $builder->qualifyColumn('attribute_id'), '=', 'eav_attribute.attribute_id');
+        });
+
+        if (isset(static::$hasAttributeOptions)) { // @phpstan-ignore-line
+            static::addGlobalScope('attributeOptions', function (Builder $builder) {
+                $builder->with('attributeOptions'); // @phpstan-ignore-line
+            });
+        }
+    }
+
+    public function getTable()
+    {
+        // Overwritten to always return table, so that qualifyColumn and such work
+        return $this->table;
+    }
+
+    protected function value(): Attribute
+    {
+        return Attribute::get(function ($value) {
+            $class = config('rapidez.attribute-models')[$this->backend_model] ?? null;
+
+            if ($class) {
+                return $class::value($value, $this);
+            }
+
+            return array_key_exists('value', $this->getCasts())
+                ? $this->castAttribute('value', $value)
+                : $value;
+        });
+    }
+
+    // TODO: Maybe rename this? As this value is mostly used.
+    // And maybe add the option value keys in the array?
+    protected function transformedValue(): Attribute
+    {
+        return Attribute::get(function () {
+            if ($this->frontend_input === 'select' || $this->frontend_input === 'multiselect') {
+                if (is_iterable($this->value)) {
+                    return Arr::map(
+                        iterator_to_array($this->value),
+                        fn ($value) => $this->options[$value]?->value ?? $value,
+                    );
+                }
+
+                return $this->options[$this->value]?->value ?? $this->value;
+            }
+
+            return $this->value;
+        });
+    }
+
+    protected function label(): Attribute
+    {
+        return Attribute::get(function () {
+            return is_iterable($this->transformedValue)
+                ? implode(', ', iterator_to_array($this->transformedValue))
+                : $this->transformedValue;
+        });
+    }
+
+    protected function sortOrder(): Attribute
+    {
+        return Attribute::get(fn () => $this->options[$this->value]->sort_order ?? null);
+    }
+
+    public function __toString(): string
+    {
+        return $this->label;
+    }
+
+    public function toArray()
+    {
+        return $this->transformed_value;
+    }
+}
diff --git a/src/Models/Attribute.php b/src/Models/Attribute.php
index ed2056e57..5768ad9c4 100644
--- a/src/Models/Attribute.php
+++ b/src/Models/Attribute.php
@@ -5,6 +5,7 @@
 use Illuminate\Database\Eloquent\Casts\Attribute as CastsAttribute;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
 use Rapidez\Core\Models\Scopes\Attribute\OnlyProductAttributesScope;
 
 class Attribute extends Model
@@ -44,6 +45,13 @@ protected function prefix(): CastsAttribute
         )->shouldCache();
     }
 
+    public static function getCached()
+    {
+        return Cache::rememberForever('eav_attributes', function () {
+            return DB::table('eav_attribute')->get()->keyBy('attribute_code');
+        });
+    }
+
     public static function getCachedWhere(callable $callback): array
     {
         $attributes = Cache::store('rapidez:multi')->rememberForever('attributes.' . config('rapidez.store'), function () {
diff --git a/src/Models/AttributeDatetime.php b/src/Models/AttributeDatetime.php
new file mode 100644
index 000000000..f174bce10
--- /dev/null
+++ b/src/Models/AttributeDatetime.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Rapidez\Core\Models;
+
+class AttributeDatetime extends AbstractAttribute
+{
+    protected $casts = ['value' => 'datetime'];
+}
diff --git a/src/Models/AttributeDecimal.php b/src/Models/AttributeDecimal.php
new file mode 100644
index 000000000..401872b2a
--- /dev/null
+++ b/src/Models/AttributeDecimal.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Rapidez\Core\Models;
+
+class AttributeDecimal extends AbstractAttribute
+{
+    protected $casts = ['value' => 'float'];
+}
diff --git a/src/Models/AttributeInt.php b/src/Models/AttributeInt.php
new file mode 100644
index 000000000..ac4eb82d8
--- /dev/null
+++ b/src/Models/AttributeInt.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Rapidez\Core\Models;
+
+use Rapidez\Core\Models\Traits\HasAttributeOptions;
+
+class AttributeInt extends AbstractAttribute
+{
+    use HasAttributeOptions;
+}
diff --git a/src/Models/AttributeModels/ArrayBackend.php b/src/Models/AttributeModels/ArrayBackend.php
new file mode 100644
index 000000000..59ac31cee
--- /dev/null
+++ b/src/Models/AttributeModels/ArrayBackend.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Rapidez\Core\Models\AttributeModels;
+
+class ArrayBackend implements AttributeModel
+{
+    public static function value($value, $attribute)
+    {
+        if (! $value) {
+            return collect();
+        }
+
+        return collect(explode(',', $value));
+    }
+}
diff --git a/src/Models/AttributeModels/AttributeModel.php b/src/Models/AttributeModels/AttributeModel.php
new file mode 100644
index 000000000..a04ca1d72
--- /dev/null
+++ b/src/Models/AttributeModels/AttributeModel.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Rapidez\Core\Models\AttributeModels;
+
+interface AttributeModel
+{
+    public static function value($value, $attribute);
+}
diff --git a/src/Models/AttributeOption.php b/src/Models/AttributeOption.php
new file mode 100644
index 000000000..376b3f0c4
--- /dev/null
+++ b/src/Models/AttributeOption.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Rapidez\Core\Models;
+
+use Illuminate\Contracts\Database\Eloquent\Builder;
+use Illuminate\Database\Query\JoinClause;
+
+class AttributeOption extends Model
+{
+    protected $table = 'eav_attribute_option';
+
+    protected static function boot(): void
+    {
+        parent::boot();
+
+        static::addGlobalScope('values', function (Builder $builder) {
+            $builder->leftJoin('eav_attribute_option_value', function (JoinClause $join) use ($builder) {
+                $join->on($builder->qualifyColumn('option_id'), '=', 'eav_attribute_option_value.option_id')
+                    ->whereIn('store_id', [0, config('rapidez.store')]);
+            });
+        });
+    }
+}
diff --git a/src/Models/AttributeText.php b/src/Models/AttributeText.php
new file mode 100644
index 000000000..05dd4211b
--- /dev/null
+++ b/src/Models/AttributeText.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Rapidez\Core\Models;
+
+use Rapidez\Core\Models\Traits\HasAttributeOptions;
+
+class AttributeText extends AbstractAttribute
+{
+    use HasAttributeOptions;
+}
diff --git a/src/Models/AttributeVarchar.php b/src/Models/AttributeVarchar.php
new file mode 100644
index 000000000..10196c043
--- /dev/null
+++ b/src/Models/AttributeVarchar.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Rapidez\Core\Models;
+
+use Rapidez\Core\Models\Traits\HasAttributeOptions;
+
+class AttributeVarchar extends AbstractAttribute
+{
+    use HasAttributeOptions;
+}
diff --git a/src/Models/Category.php b/src/Models/Category.php
index d98c0a485..8df24d0d4 100644
--- a/src/Models/Category.php
+++ b/src/Models/Category.php
@@ -4,7 +4,6 @@
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Rapidez\Core\Models\Scopes\IsActiveScope;
 use Rapidez\Core\Models\Traits\HasAlternatesThroughRewrites;
@@ -58,6 +57,11 @@ protected static function booting()
         });
     }
 
+    protected static function getEntityType(): string
+    {
+        return 'category';
+    }
+
     public function getTable()
     {
         return 'catalog_category_flat_store_' . config('rapidez.store');
@@ -90,14 +94,6 @@ public function products(): HasManyThrough
             ->whereIn((new (config('rapidez.models.category_product')))->qualifyColumn('visibility'), [2, 4]);
     }
 
-    public function rewrites(): HasMany
-    {
-        return $this
-            ->hasMany(config('rapidez.models.rewrite'), 'entity_id', 'entity_id')
-            ->withoutGlobalScope('store')
-            ->where('entity_type', 'category');
-    }
-
     protected function parentcategories(): Attribute
     {
         return Attribute::make(
diff --git a/src/Models/CategoryProduct.php b/src/Models/CategoryProduct.php
index 780b73a85..8477e981b 100644
--- a/src/Models/CategoryProduct.php
+++ b/src/Models/CategoryProduct.php
@@ -2,6 +2,8 @@
 
 namespace Rapidez\Core\Models;
 
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
 class CategoryProduct extends Model
 {
     protected $primaryKey = 'entity_id';
@@ -10,4 +12,9 @@ public function getTable()
     {
         return 'catalog_category_product_index_store' . config('rapidez.store');
     }
+
+    public function category(): BelongsTo
+    {
+        return $this->belongsTo(config('rapidez.models.category'), 'category_id', 'entity_id');
+    }
 }
diff --git a/src/Models/CheckoutAgreement.php b/src/Models/CheckoutAgreement.php
index 8c4a6bce2..656036f7d 100644
--- a/src/Models/CheckoutAgreement.php
+++ b/src/Models/CheckoutAgreement.php
@@ -11,8 +11,6 @@ class CheckoutAgreement extends Model
 
     protected $primaryKey = 'agreement_id';
 
-    protected $guarded = [];
-
     protected static function booting()
     {
         static::addGlobalScope(new IsActiveScope);
diff --git a/src/Models/Config.php b/src/Models/Config.php
index b16d9ee08..cee74fd3d 100644
--- a/src/Models/Config.php
+++ b/src/Models/Config.php
@@ -23,8 +23,6 @@ class Config extends Model
 
     const CREATED_AT = null;
 
-    protected $guarded = [];
-
     protected static function booting()
     {
         static::addGlobalScope('scope-fallback', function (Builder $builder) {
diff --git a/src/Models/EavAttribute.php b/src/Models/EavAttribute.php
new file mode 100644
index 000000000..ebfacd597
--- /dev/null
+++ b/src/Models/EavAttribute.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Rapidez\Core\Models;
+
+use Illuminate\Support\Facades\Cache;
+
+class EavAttribute extends Model
+{
+    // TODO: Maybe create a model for this and cache it?
+    // But most likely it's never going to change...
+    public const ENTITY_TYPE_CUSTOMER = 1;
+    public const ENTITY_TYPE_CUSTOMER_ADDRESS = 2;
+    public const ENTITY_TYPE_CATALOG_CATEGORY = 3;
+    public const ENTITY_TYPE_CATALOG_PRODUCT = 4;
+
+    protected $table = 'eav_attribute';
+
+    protected $primaryKey = 'attribute_id';
+
+    public static function getCachedCatalog()
+    {
+        return Cache::memo()->rememberForever('catalog_eav_attributes', function () {
+            return EavAttribute::query()
+                ->leftJoin('catalog_eav_attribute', 'catalog_eav_attribute.attribute_id', '=', 'eav_attribute.attribute_id')
+                ->where('entity_type_id', self::ENTITY_TYPE_CATALOG_PRODUCT)
+                ->get();
+        });
+    }
+
+    public static function getCachedCustomer()
+    {
+        return Cache::memo()->rememberForever('customer_eav_attributes', function () {
+            return EavAttribute::query()
+                ->leftJoin('customer_eav_attribute', 'customer_eav_attribute.attribute_id', '=', 'eav_attribute.attribute_id')
+                // TODO: This also needs an entity type check or
+                // it should just join instead of left join
+                // but not sure if it's used currently?
+                ->get();
+        });
+    }
+
+    public static function getCachedIndexable()
+    {
+        return Cache::memo()->rememberForever('indexable_eav_attributes', function () {
+            return static::getCachedCatalog()->where(fn ($attribute) => $attribute->backend_type === 'static'
+                || $attribute->is_used_for_promo_rules
+                || $attribute->used_in_product_listing
+                || $attribute->used_for_sort_by
+                || in_array($attribute->attribute_code, ['status', 'required_options', 'tax_class_id', 'weight']));
+        });
+    }
+}
diff --git a/src/Models/Model.php b/src/Models/Model.php
index e2df93593..c7e7be8d0 100644
--- a/src/Models/Model.php
+++ b/src/Models/Model.php
@@ -15,6 +15,8 @@ class Model extends BaseModel
         Macroable::__callStatic as macroCallStatic;
     }
 
+    protected $guarded = [];
+
     public static ?string $modelName;
 
     public function __call($method, $parameters)
diff --git a/src/Models/Product.php b/src/Models/Product.php
index 1d1de2a09..67317e40e 100644
--- a/src/Models/Product.php
+++ b/src/Models/Product.php
@@ -2,100 +2,89 @@
 
 namespace Rapidez\Core\Models;
 
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
-use Illuminate\Database\Eloquent\Relations\HasOneThrough;
-use Rapidez\Core\Casts\Children;
-use Rapidez\Core\Casts\CommaSeparatedToArray;
-use Rapidez\Core\Casts\CommaSeparatedToIntegerArray;
-use Rapidez\Core\Casts\DecodeHtmlEntities;
+use Illuminate\Support\Collection;
 use Rapidez\Core\Facades\Rapidez;
-use Rapidez\Core\Models\Scopes\Product\WithProductAttributesScope;
-use Rapidez\Core\Models\Scopes\Product\WithProductCategoryInfoScope;
-use Rapidez\Core\Models\Scopes\Product\WithProductChildrenScope;
-use Rapidez\Core\Models\Scopes\Product\WithProductGroupedScope;
-use Rapidez\Core\Models\Scopes\Product\WithProductRelationIdsScope;
-use Rapidez\Core\Models\Scopes\Product\WithProductStockScope;
-use Rapidez\Core\Models\Scopes\Product\WithProductSuperAttributesScope;
+use Rapidez\Core\Models\Scopes\Product\EnabledScope;
+use Rapidez\Core\Models\Scopes\Product\ForCurrentWebsiteScope;
+use Rapidez\Core\Models\Scopes\Product\SupportedScope;
 use Rapidez\Core\Models\Traits\HasAlternatesThroughRewrites;
-use Rapidez\Core\Models\Traits\Product\CastMultiselectAttributes;
-use Rapidez\Core\Models\Traits\Product\CastSuperAttributes;
+use Rapidez\Core\Models\Traits\HasCustomAttributes;
+use Rapidez\Core\Models\Traits\Product\BackwardsCompatibleAccessors;
+use Rapidez\Core\Models\Traits\Product\HasSuperAttributes;
 use Rapidez\Core\Models\Traits\Product\Searchable;
-use Rapidez\Core\Models\Traits\Product\SelectAttributeScopes;
-use TorMorten\Eventy\Facades\Eventy;
 
 class Product extends Model
 {
-    use CastMultiselectAttributes;
-    use CastSuperAttributes;
+    use BackwardsCompatibleAccessors;
     use HasAlternatesThroughRewrites;
+    use HasCustomAttributes;
+    use HasSuperAttributes;
     use Searchable;
-    use SelectAttributeScopes;
 
     public const VISIBILITY_NOT_VISIBLE = 1;
     public const VISIBILITY_IN_CATALOG = 2;
     public const VISIBILITY_IN_SEARCH = 3;
     public const VISIBILITY_BOTH = 4;
 
-    public array $attributesToSelect = [];
+    public const STATUS_ENABLED = 1;
+    public const STATUS_DISABLED = 2;
 
+    protected $table = 'catalog_product_entity';
     protected $primaryKey = 'entity_id';
 
-    protected $casts = [
-        self::UPDATED_AT => 'datetime',
-        self::CREATED_AT => 'datetime',
+    protected $with = [
+        'stock',
+        'superAttributes',
+        'categoryProducts.category',
+        'children',
+        'options',
+        'gallery',
+        'prices',
     ];
 
-    protected $appends = ['url'];
-
-    protected static function booting(): void
-    {
-        static::addGlobalScope(new WithProductAttributesScope);
-        static::addGlobalScope(new WithProductSuperAttributesScope);
-        static::addGlobalScope(new WithProductStockScope);
-        static::addGlobalScope(new WithProductCategoryInfoScope);
-        static::addGlobalScope(new WithProductRelationIdsScope);
-        static::addGlobalScope(new WithProductChildrenScope);
-        static::addGlobalScope(new WithProductGroupedScope);
-        static::addGlobalScope('defaults', function (Builder $builder) {
-            $builder
-                ->whereNotIn($builder->getQuery()->from . '.type_id', ['bundle'])
-                ->groupBy($builder->getQuery()->from . '.entity_id');
-        });
+    protected $appends = [
+        'price',
+        'special_price',
+        'url',
+
+        // TODO: Double check; do we really want all accessors
+        // defined here so they will show up in the indexer?
+        // See the BackwardsCompatibleAccessors
+        'in_stock',
+    ];
+
+    protected static function booted(): void
+    {
+        static::addGlobalScope(EnabledScope::class);
+        static::addGlobalScope(SupportedScope::class);
+        static::addGlobalScope(ForCurrentWebsiteScope::class);
+        static::withCustomAttributes();
     }
 
-    public function getTable(): string
+    protected function modifyRelation(HasMany $relation): HasMany
     {
-        return 'catalog_product_flat_' . config('rapidez.store');
+        return $relation->leftJoin('catalog_eav_attribute', 'catalog_eav_attribute.attribute_id', '=', $relation->qualifyColumn('attribute_id'));
     }
 
-    public function getCasts(): array
+    protected static function getEntityType(): string
     {
-        if (! isset($this->casts['name'])) {
-            $this->casts = array_merge(
-                parent::getCasts(),
-                [
-                    'name'           => DecodeHtmlEntities::class,
-                    'category_ids'   => CommaSeparatedToIntegerArray::class,
-                    'category_paths' => CommaSeparatedToArray::class,
-                    'relation_ids'   => CommaSeparatedToIntegerArray::class,
-                    'upsell_ids'     => CommaSeparatedToIntegerArray::class,
-                    'children'       => Children::class,
-                    'grouped'        => Children::class,
-                    'qty_increments' => 'float',
-                    'min_sale_qty'   => 'float',
-                    'max_sale_qty'   => 'float',
-                ],
-                $this->getSuperAttributeCasts(),
-                $this->getMultiselectAttributeCasts(),
-                Eventy::filter(static::getModelName() . '.casts', []),
-            );
+        return 'product';
+    }
+
+    public function only($attributes)
+    {
+        $data = parent::only($attributes);
+
+        if (array_key_exists('children', $data)) {
+            $data['children'] = $data['children']->map(fn ($child) => $child->only($attributes));
         }
 
-        return $this->casts;
+        return $data;
     }
 
     public function gallery(): BelongsToMany
@@ -108,137 +97,152 @@ public function gallery(): BelongsToMany
         );
     }
 
-    public function views(): HasMany
+    protected function images(): Attribute
+    {
+        return Attribute::get(
+            fn (): array => $this->gallery->sortBy('productImageValue.position')->pluck('value')->toArray()
+        )->shouldCache();
+    }
+
+    public function parents(): BelongsToMany
+    {
+        return $this->belongsToMany(config('rapidez.models.product'), 'catalog_product_relation', 'child_id', 'parent_id');
+    }
+
+    public function getParentsAttribute(): Collection
+    {
+        return $this->getRelationValue('parents')->keyBy('entity_id');
+    }
+
+    public function children(): BelongsToMany
+    {
+        return $this->belongsToMany(config('rapidez.models.product'), 'catalog_product_relation', 'parent_id', 'child_id');
+    }
+
+    public function getChildrenAttribute(): Collection
+    {
+        return $this->getRelationValue('children')->keyBy('entity_id');
+    }
+
+    protected function grouped(): Attribute
+    {
+        return Attribute::get(fn () => $this->children);
+    }
+
+    public function productLinks(): HasMany
     {
         return $this->hasMany(
-            config('rapidez.models.product_view'),
-            'product_id',
+            config('rapidez.models.product_link', ProductLink::class),
+            'product_id', 'entity_id',
         );
     }
 
-    public function options(): HasMany
+    public function productLinkParents(): HasMany
     {
         return $this->hasMany(
-            config('rapidez.models.product_option'),
-            'product_id',
+            config('rapidez.models.product_link', ProductLink::class),
+            'linked_product_id', 'entity_id',
         );
     }
 
+    public function getLinkedProducts(string $type): Collection
+    {
+        return $this->productLinks()
+            ->with('linkedProduct')
+            ->where('code', $type)
+            ->get()
+            ->pluck('linkedProduct');
+    }
+
+    public function getLinkedParents(string $type): Collection
+    {
+        return $this->productLinkParents()
+            ->with('linkedParent')
+            ->where('code', $type)
+            ->get()
+            ->pluck('linkedParent');
+    }
+
     public function categoryProducts(): HasMany
     {
         return $this
             ->hasMany(
                 config('rapidez.models.category_product'),
                 'product_id',
-            );
+            )
+            ->whereHas('category');
     }
 
-    public function reviewSummary(): HasOne
+    public function stock(): BelongsTo
     {
-        return $this->hasOne(
-            config('rapidez.models.product_review_summary', \Rapidez\Core\Models\ProductReviewSummary::class),
-            'entity_pk_value'
+        return $this->belongsTo(
+            config('rapidez.models.product_stock'),
+            'entity_id',
+            'product_id',
         );
     }
 
-    public function rewrites(): HasMany
-    {
-        return $this
-            ->hasMany(config('rapidez.models.rewrite'), 'entity_id')
-            ->withoutGlobalScope('store')
-            ->where('entity_type', 'product');
-    }
-
-    public function parent(): HasOneThrough
+    public function options(): HasMany
     {
-        return $this->hasOneThrough(
-            config('rapidez.models.product'),
-            config('rapidez.models.product_link'),
-            'product_id', 'entity_id',
-            'entity_id', 'parent_id'
-        )->withoutGlobalScopes();
+        return $this->hasMany(
+            config('rapidez.models.product_option'),
+            'product_id',
+        );
     }
 
-    public function scopeByIds(Builder $query, array $productIds): Builder
+    public function reviewSummary(): HasOne
     {
-        return $query->whereIn($this->getQualifiedKeyName(), $productIds);
+        return $this->hasOne(
+            config('rapidez.models.product_review_summary'),
+            'entity_pk_value'
+        );
     }
 
-    protected function price(): Attribute
+    public function reviews(): BelongsToMany
     {
-        return Attribute::make(
-            get: function (?float $price): ?float {
-                if ($this->type_id == 'configurable') {
-                    return collect($this->children)->min->price;
-                }
-
-                if ($this->type_id == 'grouped') {
-                    return collect($this->grouped)->min->price;
-                }
-
-                return $price;
-            }
-        );
+        return $this->belongsToMany(
+            config('rapidez.models.product_review', Review::class), 'review',
+            'entity_pk_value', 'review_id',
+            'entity_id', 'review_id',
+        )->where('review.entity_id', Review::REVIEW_ENTITY_PRODUCT);
     }
 
-    protected function specialPrice(): Attribute
+    public function views(): HasMany
     {
-        return Attribute::make(
-            get: function (?float $specialPrice): ?float {
-                if (! in_array($this->type_id, ['configurable', 'grouped'])) {
-                    if ($this->special_from_date && $this->special_from_date > now()->toDateTimeString()) {
-                        return null;
-                    }
-
-                    if ($this->special_to_date && $this->special_to_date < now()->toDateTimeString()) {
-                        return null;
-                    }
-
-                    return $specialPrice < $this->price ? $specialPrice : null;
-                }
-
-                return collect($this->type_id == 'configurable' ? $this->children : $this->grouped)->filter(function ($child) {
-                    if (! $child->special_price) {
-                        return false;
-                    }
-
-                    if (isset($child->special_from_date) && $child->special_from_date > now()->toDateTimeString()) {
-                        return false;
-                    }
-
-                    if (isset($child->special_to_date) && $child->special_to_date < now()->toDateTimeString()) {
-                        return false;
-                    }
-
-                    return true;
-                })->min->special_price;
-            }
+        return $this->hasMany(
+            config('rapidez.models.product_view'),
+            'product_id',
         );
     }
 
-    protected function minSaleQty(): Attribute
+    public function tierPrices(): HasMany
     {
-        return Attribute::make(
-            get: function (?float $minSaleQty): ?float {
-                $increments = $this->qty_increments ?: 1;
-
-                return ($minSaleQty - fmod($minSaleQty, $increments)) ?: $increments;
-            }
-        );
+        return $this->hasMany(
+            config('rapidez.models.product_tier_price', ProductTierPrice::class),
+            'entity_id',
+            'entity_id'
+        )->whereIn('website_id', [0, config('rapidez.website')]);
     }
 
-    protected function url(): Attribute
+    public function getUnitPrice(int $quantity = 1, int $customerGroup = 0)
     {
-        return Attribute::make(
-            get: fn (): string => '/' . ($this->url_key ? $this->url_key . Rapidez::config('catalog/seo/product_url_suffix') : 'catalog/product/view/id/' . $this->entity_id)
-        );
+        $tierPrice = $this->tierPrices()
+            ->where(function ($query) use ($customerGroup) {
+                $query->where('customer_group_id', $customerGroup)
+                    ->orWhere('all_groups', '1');
+            })
+            ->where('qty', '<=', $quantity)
+            ->orderBy('value')
+            ->first()?->value ?? null;
+        // NOTE: We always need the option with the lowest matching value, *not* the one with the highest matching qty!
+        // It wouldn't make sense to select a tier with a higher qty if the price is higher.
+
+        return $tierPrice ?? $this->price;
     }
 
-    protected function images(): Attribute
+    public function getPrice(int $quantity = 1, int $customerGroup = 0)
     {
-        return Attribute::make(
-            get: fn (): array => $this->gallery->sortBy('productImageValue.position')->pluck('value')->toArray()
-        )->shouldCache();
+        return $this->getUnitPrice($quantity, $customerGroup) * $quantity;
     }
 
     private function getImageFrom(?string $image): ?string
@@ -248,52 +252,89 @@ private function getImageFrom(?string $image): ?string
 
     protected function image(): Attribute
     {
-        return Attribute::make(
-            get: $this->getImageFrom(...)
-        );
+        return Attribute::get($this->getImageFrom(...));
     }
 
     protected function smallImage(): Attribute
     {
-        return Attribute::make(
-            get: $this->getImageFrom(...)
-        );
+        return Attribute::get($this->getImageFrom(...));
     }
 
     protected function thumbnail(): Attribute
+    {
+        return Attribute::get($this->getImageFrom(...));
+    }
+
+    protected function url(): Attribute
     {
         return Attribute::make(
-            get: $this->getImageFrom(...)
+            get: fn (): string => '/' . ($this->url_key ? $this->url_key . Rapidez::config('catalog/seo/product_url_suffix') : 'catalog/product/view/id/' . $this->entity_id)
         );
     }
 
-    protected function breadcrumbCategories(): Attribute
+    // Keep in mind this is the base price and
+    // the price could be something else
+    // based on the customer group
+    // or by any tier pricing.
+    protected function price(): Attribute
     {
-        return Attribute::make(
-            get: function (): iterable {
-                if (! $path = session('latest_category_path')) {
-                    return [];
-                }
+        return Attribute::get(function () {
+            $customerGroupId = auth('magento-customer')
+                ->user()
+                ?->group_id ?: 0;
 
-                $categoryIds = explode('/', $path);
-                $categoryIds = array_slice($categoryIds, array_search(config('rapidez.root_category_id'), $categoryIds) + 1);
+            $price = $this
+                ->prices
+                ->firstWhere('customer_group_id', $customerGroupId);
 
-                if (! in_array(end($categoryIds), $this->category_ids)) {
-                    return [];
-                }
+            return $price->price ?: $price->min_price;
+        });
+    }
 
-                $categoryModel = config('rapidez.models.category');
-                $categoryTable = (new $categoryModel)->getTable();
+    // We're not applying the customer group here so
+    // all the prices for customer groups are
+    // returned for the indexer.
+    public function prices(): hasMany
+    {
+        // TODO: Double check the prices with the indexer.
+        // We should index all customer group prices
+        // as we can only verify that on the
+        // frontend. But currenlty this
+        // is also loading all prices
+        // for just a product page.
+        return $this
+            ->hasMany(
+                config('rapidez.models.product_price', ProductPrice::class),
+                'entity_id',
+                'entity_id'
+            );
+    }
 
-                return Category::whereIn($categoryTable . '.entity_id', $categoryIds)
-                    ->orderByRaw('FIELD(' . $categoryTable . '.entity_id,' . implode(',', $categoryIds) . ')')
-                    ->get();
-            },
-        )->shouldCache();
+    protected function specialPrice(): Attribute
+    {
+        return Attribute::get(function (): ?float {
+            $customerGroupId = auth('magento-customer')
+                ->user()
+                ?->group_id ?: 0;
+
+            // We're using the price index table that
+            // handles the special from/to dates.
+            $specialPrice = $this
+                ->prices
+                ->firstWhere('customer_group_id', $customerGroupId)
+                ->min_price;
+
+            return $specialPrice < $this->price ? $specialPrice : null;
+        });
     }
 
-    public static function exist($productId): bool
+    protected function breadcrumbCategories(): Attribute
     {
-        return self::withoutGlobalScopes()->where('entity_id', $productId)->exists();
+        return Attribute::get(function (): Collection {
+            return $this->categoryProducts
+                ->where('category_id', '!=', config('rapidez.root_category_id'))
+                ->pluck('category')
+                ->whereNotNull();
+        })->shouldCache();
     }
 }
diff --git a/src/Models/ProductLink.php b/src/Models/ProductLink.php
index 258638dd5..7c31cca07 100644
--- a/src/Models/ProductLink.php
+++ b/src/Models/ProductLink.php
@@ -2,14 +2,51 @@
 
 namespace Rapidez\Core\Models;
 
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasOne;
+use Rapidez\Core\Models\Traits\HasCustomAttributes;
+
 class ProductLink extends Model
 {
+    use HasCustomAttributes;
+
     const CREATED_AT = null;
     const UPDATED_AT = null;
 
-    protected $table = 'catalog_product_super_link';
+    protected $table = 'catalog_product_link';
+
+    protected $attributeTypes = ['int', 'decimal', 'varchar'];
+    protected $attributeTablePrefix = 'catalog_product_link_attribute';
+    protected $attributeCode = 'product_link_attribute_code';
 
     protected $primaryKey = 'link_id';
 
-    protected $guarded = [];
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::withCustomAttributes();
+        static::addGlobalScope('withLinkType', fn (Builder $builder) => $builder->join('catalog_product_link_type', 'catalog_product_link_type.link_type_id', '=', 'catalog_product_link.link_type_id'));
+    }
+
+    protected function modifyRelation(HasMany $relation): HasMany
+    {
+        $relation->withoutGlobalScopes(['store', 'attribute']);
+        $relation->withGlobalScope('productLinkAttribute', function (Builder $builder) {
+            $builder->leftJoin('catalog_product_link_attribute', $builder->qualifyColumn('product_link_attribute_id'), '=', 'catalog_product_link_attribute.product_link_attribute_id');
+        });
+
+        return $relation;
+    }
+
+    public function linkedProduct(): HasOne
+    {
+        return $this->hasOne(config('rapidez.models.product'), 'entity_id', 'linked_product_id');
+    }
+
+    public function linkedParent(): HasOne
+    {
+        return $this->hasOne(config('rapidez.models.product'), 'entity_id', 'product_id');
+    }
 }
diff --git a/src/Models/ProductOld.php b/src/Models/ProductOld.php
new file mode 100644
index 000000000..52a951181
--- /dev/null
+++ b/src/Models/ProductOld.php
@@ -0,0 +1,305 @@
+<?php
+
+// namespace Rapidez\Core\Models;
+
+// use Illuminate\Database\Eloquent\Builder;
+// use Illuminate\Database\Eloquent\Casts\Attribute;
+// use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+// use Illuminate\Database\Eloquent\Relations\HasMany;
+// use Illuminate\Database\Eloquent\Relations\HasOne;
+// use Illuminate\Database\Eloquent\Relations\HasOneThrough;
+// use Rapidez\Core\Casts\Children;
+// use Rapidez\Core\Casts\CommaSeparatedToArray;
+// use Rapidez\Core\Casts\CommaSeparatedToIntegerArray;
+// use Rapidez\Core\Casts\DecodeHtmlEntities;
+// use Rapidez\Core\Facades\Rapidez;
+// use Rapidez\Core\Models\Scopes\Product\WithProductAttributesScope;
+// use Rapidez\Core\Models\Scopes\Product\WithProductCategoryInfoScope;
+// use Rapidez\Core\Models\Scopes\Product\WithProductChildrenScope;
+// use Rapidez\Core\Models\Scopes\Product\WithProductGroupedScope;
+// use Rapidez\Core\Models\Scopes\Product\WithProductRelationIdsScope;
+// use Rapidez\Core\Models\Scopes\Product\WithProductStockScope;
+// use Rapidez\Core\Models\Scopes\Product\WithProductSuperAttributesScope;
+// use Rapidez\Core\Models\Traits\HasAlternatesThroughRewrites;
+// use Rapidez\Core\Models\Traits\Product\CastMultiselectAttributes;
+// use Rapidez\Core\Models\Traits\Product\CastSuperAttributes;
+// use Rapidez\Core\Models\Traits\Product\Searchable;
+// use Rapidez\Core\Models\Traits\Product\SelectAttributeScopes;
+// use TorMorten\Eventy\Facades\Eventy;
+
+// class Product extends Model
+// {
+//     use CastMultiselectAttributes;
+//     use CastSuperAttributes;
+//     use HasAlternatesThroughRewrites;
+//     use Searchable;
+//     use SelectAttributeScopes;
+
+//     public const VISIBILITY_NOT_VISIBLE = 1;
+//     public const VISIBILITY_IN_CATALOG = 2;
+//     public const VISIBILITY_IN_SEARCH = 3;
+//     public const VISIBILITY_BOTH = 4;
+
+//     public array $attributesToSelect = [];
+
+//     protected $primaryKey = 'entity_id';
+
+//     protected $casts = [
+//         self::UPDATED_AT => 'datetime',
+//         self::CREATED_AT => 'datetime',
+//     ];
+
+//     protected $appends = ['url'];
+
+//     protected static function booting(): void
+//     {
+//         static::addGlobalScope(new WithProductAttributesScope);
+//         static::addGlobalScope(new WithProductSuperAttributesScope);
+//         static::addGlobalScope(new WithProductStockScope);
+//         static::addGlobalScope(new WithProductCategoryInfoScope);
+//         static::addGlobalScope(new WithProductRelationIdsScope);
+//         static::addGlobalScope(new WithProductChildrenScope);
+//         static::addGlobalScope(new WithProductGroupedScope);
+//         static::addGlobalScope('defaults', function (Builder $builder) {
+//             $builder
+//                 ->whereNotIn($builder->getQuery()->from . '.type_id', ['bundle'])
+//                 ->groupBy($builder->getQuery()->from . '.entity_id');
+//         });
+//     }
+
+//     public function getTable(): string
+//     {
+//         return 'catalog_product_flat_' . config('rapidez.store');
+//     }
+
+//     public function getCasts(): array
+//     {
+//         if (! isset($this->casts['name'])) {
+//             $this->casts = array_merge(
+//                 parent::getCasts(),
+//                 [
+//                     'name'           => DecodeHtmlEntities::class,
+//                     'category_ids'   => CommaSeparatedToIntegerArray::class,
+//                     'category_paths' => CommaSeparatedToArray::class,
+//                     'relation_ids'   => CommaSeparatedToIntegerArray::class,
+//                     'upsell_ids'     => CommaSeparatedToIntegerArray::class,
+//                     'children'       => Children::class,
+//                     'grouped'        => Children::class,
+//                     'qty_increments' => 'int',
+//                     'min_sale_qty'   => 'int',
+//                     'max_sale_qty'   => 'int',
+//                 ],
+//                 $this->getSuperAttributeCasts(),
+//                 $this->getMultiselectAttributeCasts(),
+//                 Eventy::filter(static::getModelName() . '.casts', []),
+//             );
+//         }
+
+//         return $this->casts;
+//     }
+
+//     public function gallery(): BelongsToMany
+//     {
+//         return $this->belongsToMany(
+//             config('rapidez.models.product_image'),
+//             'catalog_product_entity_media_gallery_value_to_entity',
+//             'entity_id',
+//             'value_id',
+//         );
+//     }
+
+//     public function views(): HasMany
+//     {
+//         return $this->hasMany(
+//             config('rapidez.models.product_view'),
+//             'product_id',
+//         );
+//     }
+
+//     public function options(): HasMany
+//     {
+//         return $this->hasMany(
+//             config('rapidez.models.product_option'),
+//             'product_id',
+//         );
+//     }
+
+//     public function categoryProducts(): HasMany
+//     {
+//         return $this
+//             ->hasMany(
+//                 config('rapidez.models.category_product'),
+//                 'product_id',
+//             );
+//     }
+
+//     public function reviewSummary(): HasOne
+//     {
+//         return $this->hasOne(
+//             config('rapidez.models.product_review_summary', \Rapidez\Core\Models\ProductReviewSummary::class),
+//             'entity_pk_value'
+//         );
+//     }
+
+//     public function rewrites(): HasMany
+//     {
+//         return $this
+//             ->hasMany(config('rapidez.models.rewrite'), 'entity_id')
+//             ->withoutGlobalScope('store')
+//             ->where('entity_type', 'product');
+//     }
+
+//     public function parent(): HasOneThrough
+//     {
+//         return $this->hasOneThrough(
+//             config('rapidez.models.product'),
+//             config('rapidez.models.product_link'),
+//             'product_id', 'entity_id',
+//             'entity_id', 'parent_id'
+//         )->withoutGlobalScopes();
+//     }
+
+//     public function scopeByIds(Builder $query, array $productIds): Builder
+//     {
+//         return $query->whereIn($this->getQualifiedKeyName(), $productIds);
+//     }
+
+//     protected function price(): Attribute
+//     {
+//         return Attribute::make(
+//             get: function (?float $price): ?float {
+//                 if ($this->type_id == 'configurable') {
+//                     return collect($this->children)->min->price;
+//                 }
+
+//                 if ($this->type_id == 'grouped') {
+//                     return collect($this->grouped)->min->price;
+//                 }
+
+//                 return $price;
+//             }
+//         );
+//     }
+
+//     protected function specialPrice(): Attribute
+//     {
+//         return Attribute::make(
+//             get: function (?float $specialPrice): ?float {
+//                 if (! in_array($this->type_id, ['configurable', 'grouped'])) {
+//                     if ($this->special_from_date && $this->special_from_date > now()->toDateTimeString()) {
+//                         return null;
+//                     }
+
+//                     if ($this->special_to_date && $this->special_to_date < now()->toDateTimeString()) {
+//                         return null;
+//                     }
+
+//                     return $specialPrice < $this->price ? $specialPrice : null;
+//                 }
+
+//                 return collect($this->type_id == 'configurable' ? $this->children : $this->grouped)->filter(function ($child) {
+//                     if (! $child->special_price) {
+//                         return false;
+//                     }
+
+//                     if (isset($child->special_from_date) && $child->special_from_date > now()->toDateTimeString()) {
+//                         return false;
+//                     }
+
+//                     if (isset($child->special_to_date) && $child->special_to_date < now()->toDateTimeString()) {
+//                         return false;
+//                     }
+
+//                     return true;
+//                 })->min->special_price;
+//             }
+//         );
+//     }
+
+//     protected function minSaleQty(): Attribute
+//     {
+//         return Attribute::make(
+//             get: function (?int $minSaleQty): ?int {
+//                 if (! $this->qty_increments) {
+//                     return $minSaleQty;
+//                 }
+//                 $remainder = $minSaleQty % $this->qty_increments;
+//                 if ($remainder === 0) {
+//                     return $minSaleQty;
+//                 }
+
+//                 return $minSaleQty - $remainder + $this->qty_increments;
+//             }
+//         );
+//     }
+
+//     protected function url(): Attribute
+//     {
+//         return Attribute::make(
+//             get: fn (): string => '/' . ($this->url_key ? $this->url_key . Rapidez::config('catalog/seo/product_url_suffix') : 'catalog/product/view/id/' . $this->entity_id)
+//         );
+//     }
+
+//     protected function images(): Attribute
+//     {
+//         return Attribute::make(
+//             get: fn (): array => $this->gallery->sortBy('productImageValue.position')->pluck('value')->toArray()
+//         )->shouldCache();
+//     }
+
+//     private function getImageFrom(?string $image): ?string
+//     {
+//         return $image !== 'no_selection' ? $image : null;
+//     }
+
+//     protected function image(): Attribute
+//     {
+//         return Attribute::make(
+//             get: $this->getImageFrom(...)
+//         );
+//     }
+
+//     protected function smallImage(): Attribute
+//     {
+//         return Attribute::make(
+//             get: $this->getImageFrom(...)
+//         );
+//     }
+
+//     protected function thumbnail(): Attribute
+//     {
+//         return Attribute::make(
+//             get: $this->getImageFrom(...)
+//         );
+//     }
+
+//     protected function breadcrumbCategories(): Attribute
+//     {
+//         return Attribute::make(
+//             get: function (): iterable {
+//                 if (! $path = session('latest_category_path')) {
+//                     return [];
+//                 }
+
+//                 $categoryIds = explode('/', $path);
+//                 $categoryIds = array_slice($categoryIds, array_search(config('rapidez.root_category_id'), $categoryIds) + 1);
+
+//                 if (! in_array(end($categoryIds), $this->category_ids)) {
+//                     return [];
+//                 }
+
+//                 $categoryModel = config('rapidez.models.category');
+//                 $categoryTable = (new $categoryModel)->getTable();
+
+//                 return Category::whereIn($categoryTable . '.entity_id', $categoryIds)
+//                     ->orderByRaw('FIELD(' . $categoryTable . '.entity_id,' . implode(',', $categoryIds) . ')')
+//                     ->get();
+//             },
+//         )->shouldCache();
+//     }
+
+//     public static function exist($productId): bool
+//     {
+//         return self::withoutGlobalScopes()->where('entity_id', $productId)->exists();
+//     }
+// }
diff --git a/src/Models/ProductPrice.php b/src/Models/ProductPrice.php
new file mode 100644
index 000000000..ea5ed3eef
--- /dev/null
+++ b/src/Models/ProductPrice.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Rapidez\Core\Models;
+
+use Illuminate\Contracts\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class ProductPrice extends Model
+{
+    public $timestamps = false;
+
+    protected $table = 'catalog_product_index_price';
+
+    protected $primaryKey = null;
+
+    protected static function booting()
+    {
+        // This index table does always have
+        // values for all websites, so
+        // no fallback is needed.
+        static::addGlobalScope('website', function (Builder $builder) {
+            $builder->where('website_id', config('rapidez.website'));
+        });
+    }
+
+    public function product(): BelongsTo
+    {
+        return $this->belongsTo(
+            config('rapidez.models.product'),
+            'entity_id'
+        );
+    }
+}
diff --git a/src/Models/ProductStock.php b/src/Models/ProductStock.php
new file mode 100644
index 000000000..fd9a140b3
--- /dev/null
+++ b/src/Models/ProductStock.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Rapidez\Core\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Rapidez\Core\Facades\Rapidez;
+
+class ProductStock extends Model
+{
+    protected $table = 'cataloginventory_stock_item';
+
+    protected $casts = [
+        'is_in_stock' => 'boolean',
+    ];
+
+    public function getHidden()
+    {
+        $hidden = parent::getHidden();
+
+        if (! config('rapidez.system.expose_stock')) {
+            $hidden[] = 'qty';
+        }
+
+        return $hidden;
+    }
+
+    public function __get($key)
+    {
+        if ($this->hasAttribute('use_config_' . $key) && $this->getAttribute('use_config_' . $key) == 1) {
+            return Rapidez::config('cataloginventory/item_options/' . $key);
+        }
+
+        return parent::__get($key);
+    }
+
+    protected function minSaleQty(): Attribute
+    {
+        return Attribute::get(function (): ?float {
+            $increments = $this->stock->qty_increments ?: 1;
+            $minSaleQty = $this->stock->min_sale_qty ?: 1;
+
+            return ($minSaleQty - fmod($minSaleQty, $increments)) ?: $increments;
+        });
+    }
+}
diff --git a/src/Models/ProductSuperLink.php b/src/Models/ProductSuperLink.php
new file mode 100644
index 000000000..68b9e7898
--- /dev/null
+++ b/src/Models/ProductSuperLink.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Rapidez\Core\Models;
+
+use Illuminate\Database\Eloquent\Relations\Pivot;
+
+class ProductSuperLink extends Pivot
+{
+    const CREATED_AT = null;
+    const UPDATED_AT = null;
+
+    protected $table = 'catalog_product_super_link';
+
+    protected $primaryKey = 'link_id';
+}
diff --git a/src/Models/ProductTierPrice.php b/src/Models/ProductTierPrice.php
new file mode 100644
index 000000000..5d336a08a
--- /dev/null
+++ b/src/Models/ProductTierPrice.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Rapidez\Core\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class ProductTierPrice extends Model
+{
+    public $timestamps = false;
+
+    protected $table = 'catalog_product_entity_tier_price';
+
+    protected $primaryKey = 'value_id';
+
+    public function product(): BelongsTo
+    {
+        return $this->belongsTo(
+            config('rapidez.models.product'),
+            'entity_id'
+        );
+    }
+}
diff --git a/src/Models/ProductView.php b/src/Models/ProductView.php
index ab00f2b32..67d5ddd84 100644
--- a/src/Models/ProductView.php
+++ b/src/Models/ProductView.php
@@ -39,11 +39,17 @@ protected static function booted(): void
 
     public function product()
     {
-        return $this->belongsTo(Product::class, 'product_id');
+        return $this->belongsTo(
+            config('rapidez.models.product'),
+            'product_id'
+        );
     }
 
     public function store()
     {
-        return $this->belongsTo(Store::class, 'store_id');
+        return $this->belongsTo(
+            config('rapidez.models.store'),
+            'store_id'
+        );
     }
 }
diff --git a/src/Models/Quote.php b/src/Models/Quote.php
index 7496d3e35..8359049f3 100644
--- a/src/Models/Quote.php
+++ b/src/Models/Quote.php
@@ -13,8 +13,6 @@ class Quote extends Model
 
     protected $primaryKey = 'entity_id';
 
-    protected $guarded = [];
-
     protected $casts = [
         'cross_sells' => CommaSeparatedToIntegerArray::class,
     ];
diff --git a/src/Models/ReportEvent.php b/src/Models/ReportEvent.php
index 696df78db..eeaca6193 100644
--- a/src/Models/ReportEvent.php
+++ b/src/Models/ReportEvent.php
@@ -8,8 +8,6 @@ class ReportEvent extends Model
 
     protected $primaryKey = 'event_id';
 
-    protected $guarded = [];
-
     const CREATED_AT = 'logged_at';
 
     const UPDATED_AT = null;
diff --git a/src/Models/Review.php b/src/Models/Review.php
new file mode 100644
index 000000000..55c443661
--- /dev/null
+++ b/src/Models/Review.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Rapidez\Core\Models;
+
+class Review extends Model
+{
+    public const REVIEW_ENTITY_PRODUCT = 1;
+    public const REVIEW_ENTITY_CUSTOMER = 2;
+    public const REVIEW_ENTITY_CATEGORY = 3;
+
+    protected $table = 'review_detail';
+
+    protected $primaryKey = 'detail_id';
+
+    // TODO: Add rating values to reviews
+}
diff --git a/src/Models/Rewrite.php b/src/Models/Rewrite.php
index 566d3c1ea..efa6f393f 100644
--- a/src/Models/Rewrite.php
+++ b/src/Models/Rewrite.php
@@ -21,7 +21,7 @@ protected static function booting()
     public function store(): HasOne
     {
         return $this->hasOne(
-            Store::class,
+            config('rapidez.models.store'),
             'store_id',
             'store_id',
         );
diff --git a/src/Models/Scopes/ForCurrentStoreWithoutLimitScope.php b/src/Models/Scopes/ForCurrentStoreWithoutLimitScope.php
index 66434b3c0..cb0321d18 100644
--- a/src/Models/Scopes/ForCurrentStoreWithoutLimitScope.php
+++ b/src/Models/Scopes/ForCurrentStoreWithoutLimitScope.php
@@ -5,13 +5,19 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Scope;
+use Illuminate\Support\Facades\DB;
 
 /**
  * Remove results from the default store when store view specific is found.
  */
 class ForCurrentStoreWithoutLimitScope implements Scope
 {
-    public function __construct(public $uniquePerStoreKey, public $storeIdColumn = 'store_id') {}
+    public array $uniquePerStoreKeys;
+
+    public function __construct(string|array $uniquePerStoreKey, public $storeIdColumn = 'store_id')
+    {
+        $this->uniquePerStoreKeys = is_array($uniquePerStoreKey) ? $uniquePerStoreKey : [$uniquePerStoreKey];
+    }
 
     public function apply(Builder $query, Model $model)
     {
@@ -20,18 +26,26 @@ public function apply(Builder $query, Model $model)
                 ->where($query->qualifyColumn($this->storeIdColumn), 0);
         }
 
+        $scope = $this;
+
         return $query
             // Pre-filter results to be default and current store only.
             ->whereIn($query->qualifyColumn($this->storeIdColumn), [0, config('rapidez.store')])
             // Remove values from the default store where values for the current store exist.
             ->where(fn ($query) => $query
                 // Remove values where we already have values in the current store.
-                ->whereNotIn($query->qualifyColumn($this->uniquePerStoreKey), fn ($query) => $query
-                    ->select($model->qualifyColumn($this->uniquePerStoreKey))
-                    ->from($model->getTable())
-                    ->whereColumn($model->qualifyColumn($this->uniquePerStoreKey), $model->qualifyColumn($this->uniquePerStoreKey))
-                    ->where($model->qualifyColumn($this->storeIdColumn), config('rapidez.store'))
-                )
+                ->where(function ($query) use ($scope, $model) {
+                    $query
+                        ->whereNotExists(function ($query) use ($scope, $model) {
+                            $query
+                                ->select(DB::raw(1))
+                                ->from($model->getTable() . ' as comparison')
+                                ->where('comparison.' . $this->storeIdColumn, config('rapidez.store'));
+                            foreach ($scope->uniquePerStoreKeys as $uniquePerStoreKey) {
+                                $query->whereColumn('comparison.' . $uniquePerStoreKey, $model->qualifyColumn($uniquePerStoreKey));
+                            }
+                        });
+                })
                 // Unless the value IS the current store.
                 ->orWhere($query->qualifyColumn($this->storeIdColumn), config('rapidez.store'))
             );
diff --git a/src/Models/Scopes/Product/EnabledScope.php b/src/Models/Scopes/Product/EnabledScope.php
new file mode 100644
index 000000000..f2060a8d6
--- /dev/null
+++ b/src/Models/Scopes/Product/EnabledScope.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Rapidez\Core\Models\Scopes\Product;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Scope;
+use Rapidez\Core\Models\Product;
+
+class EnabledScope implements Scope
+{
+    public function apply(Builder $builder, Model $model)
+    {
+        $builder->whereAttribute('status', Product::STATUS_ENABLED);
+    }
+}
diff --git a/src/Models/Scopes/Product/ForCurrentWebsiteScope.php b/src/Models/Scopes/Product/ForCurrentWebsiteScope.php
new file mode 100644
index 000000000..3860b7a7c
--- /dev/null
+++ b/src/Models/Scopes/Product/ForCurrentWebsiteScope.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Rapidez\Core\Models\Scopes\Product;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Scope;
+
+class ForCurrentWebsiteScope implements Scope
+{
+    public function apply(Builder $builder, Model $model)
+    {
+        $builder->leftJoin('catalog_product_website', 'catalog_product_website.product_id', '=', $model->getQualifiedKeyName());
+        $builder->where('website_id', config('rapidez.website'));
+    }
+}
diff --git a/src/Models/Scopes/Product/SupportedScope.php b/src/Models/Scopes/Product/SupportedScope.php
new file mode 100644
index 000000000..657018813
--- /dev/null
+++ b/src/Models/Scopes/Product/SupportedScope.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Rapidez\Core\Models\Scopes\Product;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Scope;
+
+class SupportedScope implements Scope
+{
+    public function apply(Builder $builder, Model $model)
+    {
+        $builder->where('type_id', '<>', 'bundle');
+    }
+}
diff --git a/src/Models/Scopes/Product/WithProductAttributesScope.php b/src/Models/Scopes/Product/WithProductAttributesScope.php
deleted file mode 100644
index 9ecb17389..000000000
--- a/src/Models/Scopes/Product/WithProductAttributesScope.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-namespace Rapidez\Core\Models\Scopes\Product;
-
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Scope;
-
-class WithProductAttributesScope implements Scope
-{
-    public function apply(Builder $builder, Model $model)
-    {
-        $builder->addSelect([
-            $model->getQualifiedKeyName(),
-            $model->qualifyColumn('sku'),
-            $model->qualifyColumn('visibility'),
-            $model->qualifyColumn('type_id'),
-            $model->getQualifiedCreatedAtColumn(),
-            $model->getQualifiedUpdatedAtColumn(),
-        ]);
-
-        if (empty($model->attributesToSelect)) {
-            return;
-        }
-
-        $attributeModel = config('rapidez.models.attribute');
-        $attributes = $attributeModel::getCachedWhere(function ($attribute) use ($model) {
-            return in_array($attribute['code'], $model->attributesToSelect)
-                && ! in_array($attribute['code'], ['visibility', 'sku', 'type_id', $model->getKeyName()]);
-        });
-
-        $attributes = array_filter($attributes, fn ($a) => $a['type'] !== 'static');
-
-        $grammar = $builder->getQuery()->getGrammar();
-        foreach ($attributes as $attribute) {
-            $attribute = (object) $attribute;
-
-            if ($attribute->flat) {
-                if ($attribute->input === 'select' && $attribute->type === 'int' && ! in_array($attribute->source_model, [
-                    'Magento\Tax\Model\TaxClass\Source\Product',
-                    'Magento\Eav\Model\Entity\Attribute\Source\Boolean',
-                ])) {
-                    $builder->addSelect($builder->getQuery()->from . '.' . $attribute->code . '_value AS ' . $attribute->code);
-                } else {
-                    $builder->addSelect($builder->getQuery()->from . '.' . $attribute->code . ' AS ' . $attribute->code);
-                }
-            } else {
-                if ($attribute->input === 'select') {
-                    $builder
-                        ->selectRaw('COALESCE(ANY_VALUE(' . $grammar->wrap($attribute->code . '_option_value_' . config('rapidez.store') . '.value') . '), ANY_VALUE(' . $grammar->wrap($attribute->code . '_option_value_0.value') . ')) AS ' . $grammar->wrap($attribute->code))
-                        ->leftJoin(
-                            'catalog_product_entity_' . $attribute->type . ' AS ' . $attribute->code,
-                            function ($join) use ($builder, $attribute) {
-                                $join->on($attribute->code . '.entity_id', '=', $builder->getQuery()->from . '.entity_id')
-                                    ->where($attribute->code . '.attribute_id', $attribute->id)
-                                    ->where($attribute->code . '.store_id', 0);
-                            }
-                        )->leftJoin(
-                            'eav_attribute_option_value AS ' . $attribute->code . '_option_value_' . config('rapidez.store'),
-                            function ($join) use ($attribute) {
-                                $join->on($attribute->code . '_option_value_' . config('rapidez.store') . '.option_id', '=', $attribute->code . '.value')
-                                    ->where($attribute->code . '_option_value_' . config('rapidez.store') . '.store_id', config('rapidez.store'));
-                            }
-                        )->leftJoin(
-                            'eav_attribute_option_value AS ' . $attribute->code . '_option_value_0',
-                            function ($join) use ($attribute) {
-                                $join->on($attribute->code . '_option_value_0.option_id', '=', $attribute->code . '.value')
-                                    ->where($attribute->code . '_option_value_0.store_id', 0);
-                            }
-                        );
-                } else {
-                    $builder
-                        ->selectRaw('COALESCE(ANY_VALUE(' . $grammar->wrap($attribute->code . '_' . config('rapidez.store') . '.value') . '), ANY_VALUE(' . $grammar->wrap($attribute->code . '_0.value') . ')) AS ' . $grammar->wrap($attribute->code))
-                        ->leftJoin(
-                            'catalog_product_entity_' . $attribute->type . ' AS ' . $attribute->code . '_' . config('rapidez.store'),
-                            function ($join) use ($builder, $attribute) {
-                                $join->on($attribute->code . '_' . config('rapidez.store') . '.entity_id', '=', $builder->getQuery()->from . '.entity_id')
-                                    ->where($attribute->code . '_' . config('rapidez.store') . '.attribute_id', $attribute->id)
-                                    ->where($attribute->code . '_' . config('rapidez.store') . '.store_id', config('rapidez.store'));
-                            }
-                        )->leftJoin(
-                            'catalog_product_entity_' . $attribute->type . ' AS ' . $attribute->code . '_0',
-                            function ($join) use ($builder, $attribute) {
-                                $join->on($attribute->code . '_0.entity_id', '=', $builder->getQuery()->from . '.entity_id')
-                                    ->where($attribute->code . '_0.attribute_id', $attribute->id)
-                                    ->where($attribute->code . '_0.store_id', 0);
-                            }
-                        );
-                }
-            }
-        }
-    }
-}
diff --git a/src/Models/Scopes/Product/WithProductCategoryInfoScope.php b/src/Models/Scopes/Product/WithProductCategoryInfoScope.php
deleted file mode 100644
index c74749bd5..000000000
--- a/src/Models/Scopes/Product/WithProductCategoryInfoScope.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Rapidez\Core\Models\Scopes\Product;
-
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Scope;
-
-class WithProductCategoryInfoScope implements Scope
-{
-    public function apply(Builder $builder, Model $model)
-    {
-        // We're joining this on everything, also the simple product so we
-        // remove the duplicates with the distinct, maybe it's a better
-        // idea to create a relation and eager load this? Previously
-        // with the subselect this wasn't an issue:
-        // https://github.com/rapidez/core/blob/c30c620694fc77713364160a4bc329a8a29f844a/src/Models/Scopes/Product/WithProductCategoryIdsScope.php
-        $builder
-            ->selectRaw('GROUP_CONCAT(DISTINCT(category_id)) as category_ids')
-            ->selectRaw('GROUP_CONCAT(DISTINCT(catalog_category_flat_store_' . config('rapidez.store') . '.path)) as category_paths')
-            ->leftJoin('catalog_category_product_index_store' . config('rapidez.store'), 'catalog_category_product_index_store' . config('rapidez.store') . '.product_id', '=', $model->getTable() . '.entity_id')
-            ->leftJoin('catalog_category_flat_store_' . config('rapidez.store'), 'catalog_category_flat_store_' . config('rapidez.store') . '.entity_id', '=', 'catalog_category_product_index_store' . config('rapidez.store') . '.category_id');
-    }
-}
diff --git a/src/Models/Scopes/Product/WithProductChildrenScope.php b/src/Models/Scopes/Product/WithProductChildrenScope.php
deleted file mode 100644
index 69efda0a8..000000000
--- a/src/Models/Scopes/Product/WithProductChildrenScope.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-namespace Rapidez\Core\Models\Scopes\Product;
-
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Scope;
-use Illuminate\Support\Arr;
-use TorMorten\Eventy\Facades\Eventy;
-
-class WithProductChildrenScope implements Scope
-{
-    public function apply(Builder $builder, Model $model)
-    {
-        $flat = $builder->getQuery()->from;
-        $attributeModel = config('rapidez.models.attribute');
-
-        $superAttributes = Arr::pluck($attributeModel::getCachedWhere(function ($attribute) {
-            return $attribute['super'] && $attribute['flat'];
-        }), 'code');
-
-        $grammar = $builder->getQuery()->getGrammar();
-        $superAttributesSelect = '';
-        foreach ($superAttributes as $superAttribute) {
-            $superAttributesSelect .= '"' . $superAttribute . '", ' . $grammar->wrap('children.' . $superAttribute) . ',';
-        }
-
-        $store = config('rapidez.store', 0);
-        $stockQty = config('rapidez.system.expose_stock') ? '"qty", children_stock.qty,' : '';
-
-        $builder
-            ->selectRaw('JSON_REMOVE(JSON_OBJECTAGG(IFNULL(children.entity_id, "null__"), JSON_OBJECT(
-                ' . Eventy::filter('product.children.select', <<<QUERY
-                    "sku", children.sku,
-                    "price", children.price,
-                    "special_price", children.special_price,
-                    "special_from_date", DATE(children.special_from_date),
-                    "special_to_date", DATE(children.special_to_date),
-                    {$superAttributesSelect}
-                    "in_stock", children_stock.is_in_stock,
-                    {$stockQty}
-                    "images", (
-                        SELECT JSON_ARRAYAGG(JSON_OBJECT("value", catalog_product_entity_media_gallery.value, "position", catalog_product_entity_media_gallery_value.position))
-                        FROM catalog_product_entity_media_gallery_value
-                        LEFT JOIN catalog_product_entity_media_gallery ON catalog_product_entity_media_gallery.value_id = catalog_product_entity_media_gallery_value.value_id
-                        WHERE catalog_product_entity_media_gallery_value.entity_id = children.entity_id
-                        AND catalog_product_entity_media_gallery_value.disabled = 0
-                        AND catalog_product_entity_media_gallery_value.store_id IN (0, {$store})
-                        AND (
-                            catalog_product_entity_media_gallery_value.value_id not in (
-                                SELECT v2.value_id FROM catalog_product_entity_media_gallery_value as v2 WHERE catalog_product_entity_media_gallery_value.value_id = v2.value_id AND v2.store_id = {$store}
-                            )
-                            OR catalog_product_entity_media_gallery_value.store_id = {$store}
-                        )
-                    )
-                QUERY) . '
-            )), "$.null__") AS children')
-            ->leftJoin('catalog_product_super_link', 'catalog_product_super_link.parent_id', '=', $flat . '.entity_id')
-            ->leftJoin($flat . ' AS children', 'children.entity_id', '=', 'catalog_product_super_link.product_id')
-            ->leftJoin('cataloginventory_stock_item AS children_stock', 'children.entity_id', '=', 'children_stock.product_id');
-    }
-}
diff --git a/src/Models/Scopes/Product/WithProductGroupedScope.php b/src/Models/Scopes/Product/WithProductGroupedScope.php
deleted file mode 100644
index 84d5d19f0..000000000
--- a/src/Models/Scopes/Product/WithProductGroupedScope.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-namespace Rapidez\Core\Models\Scopes\Product;
-
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Scope;
-use TorMorten\Eventy\Facades\Eventy;
-
-class WithProductGroupedScope implements Scope
-{
-    public function apply(Builder $builder, Model $model)
-    {
-        $stockQty = config('rapidez.system.expose_stock') ? '"qty", grouped_stock.qty,' : '';
-
-        // TODO: These values should listen to:
-        // - use_config_min_sale_qty
-        // - use_config_max_sale_qty
-        // - enable_qty_increments
-        // - use_config_enable_qty_inc
-        // - use_config_qty_increments
-
-        $builder
-            ->selectRaw('JSON_REMOVE(JSON_OBJECTAGG(IFNULL(grouped.entity_id, "null__"), JSON_OBJECT(
-                ' . Eventy::filter('product.grouped.select', <<<QUERY
-                    "entity_id", grouped.entity_id,
-                    "sku", grouped.sku,
-                    "name", grouped.name,
-                    "price", grouped.price,
-                    "special_price", grouped.special_price,
-                    "special_from_date", DATE(grouped.special_from_date),
-                    "special_to_date", DATE(grouped.special_to_date),
-                    "in_stock", grouped_stock.is_in_stock,
-                    "min_sale_qty", grouped_stock.min_sale_qty,
-                    "max_sale_qty", grouped_stock.max_sale_qty,
-                    {$stockQty}
-                    "qty_increments", IFNULL(NULLIF(grouped_stock.qty_increments, 0), 1)
-                QUERY) . '
-            )), "$.null__") AS grouped')
-            ->leftJoin('catalog_product_link AS grouped_link', function ($join) use ($model) {
-                $join->on('grouped_link.product_id', '=', $model->getTable() . '.entity_id')
-                    ->where('grouped_link.link_type_id', 3);
-            })
-            ->leftJoin($model->getTable() . ' as grouped', 'grouped_link.linked_product_id', '=', 'grouped.entity_id')
-            ->leftJoin('cataloginventory_stock_item AS grouped_stock', 'grouped.entity_id', '=', 'grouped_stock.product_id');
-    }
-}
diff --git a/src/Models/Scopes/Product/WithProductRelationIdsScope.php b/src/Models/Scopes/Product/WithProductRelationIdsScope.php
deleted file mode 100644
index 909488815..000000000
--- a/src/Models/Scopes/Product/WithProductRelationIdsScope.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace Rapidez\Core\Models\Scopes\Product;
-
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Scope;
-use Illuminate\Support\Facades\DB;
-
-class WithProductRelationIdsScope implements Scope
-{
-    public function apply(Builder $builder, Model $model)
-    {
-        foreach ([1 => 'relation', 4 => 'upsell'] as $linkTypeId => $linkCode) {
-            $query = DB::table('catalog_product_link')
-                ->selectRaw('GROUP_CONCAT(linked_product_id)')
-                ->where('link_type_id', $linkTypeId)
-                ->whereColumn('product_id', $model->getTable() . '.entity_id');
-
-            $builder->selectSub($query, $linkCode . '_ids');
-        }
-    }
-}
diff --git a/src/Models/Scopes/Product/WithProductStockScope.php b/src/Models/Scopes/Product/WithProductStockScope.php
deleted file mode 100644
index d807394c8..000000000
--- a/src/Models/Scopes/Product/WithProductStockScope.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Rapidez\Core\Models\Scopes\Product;
-
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Scope;
-use Rapidez\Core\Facades\Rapidez;
-
-class WithProductStockScope implements Scope
-{
-    public function apply(Builder $builder, Model $model)
-    {
-        if (config('rapidez.system.expose_stock')) {
-            $builder->selectRaw('ANY_VALUE(cataloginventory_stock_item.qty) AS qty');
-        }
-
-        $configBackorder = Rapidez::config('cataloginventory/item_options/backorders');
-
-        // TODO: These values should listen to:
-        // - use_config_min_sale_qty
-        // - use_config_max_sale_qty
-        // - use_config_enable_qty_inc
-        // - use_config_qty_increments
-
-        $builder
-            ->selectRaw('ANY_VALUE(IF(cataloginventory_stock_item.use_config_backorders, ' . ($configBackorder ?: '0') . ', cataloginventory_stock_item.backorders)) as backorder_type')
-            ->selectRaw('ANY_VALUE(cataloginventory_stock_item.manage_stock) as manage_stock')
-            ->selectRaw('ANY_VALUE(cataloginventory_stock_item.min_sale_qty) as min_sale_qty')
-            ->selectRaw('ANY_VALUE(cataloginventory_stock_item.max_sale_qty) as max_sale_qty')
-            ->selectRaw('ANY_VALUE(cataloginventory_stock_item.is_in_stock) AS in_stock')
-            ->selectRaw('IF(ANY_VALUE(cataloginventory_stock_item.enable_qty_increments), ANY_VALUE(cataloginventory_stock_item.qty_increments), 1) AS qty_increments')
-            ->leftJoin('cataloginventory_stock_item', $model->getTable() . '.entity_id', '=', 'cataloginventory_stock_item.product_id');
-    }
-}
diff --git a/src/Models/Scopes/Product/WithProductSuperAttributesScope.php b/src/Models/Scopes/Product/WithProductSuperAttributesScope.php
deleted file mode 100644
index 7b4dfce82..000000000
--- a/src/Models/Scopes/Product/WithProductSuperAttributesScope.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace Rapidez\Core\Models\Scopes\Product;
-
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Scope;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\DB;
-
-class WithProductSuperAttributesScope implements Scope
-{
-    public function apply(Builder $builder, Model $model)
-    {
-        $attributeModel = config('rapidez.models.attribute');
-        $superAttributes = Arr::pluck($attributeModel::getCachedWhere(function ($attribute) {
-            return $attribute['super'] && $attribute['flat'];
-        }), 'code', 'id');
-
-        $grammar = $builder->getQuery()->getGrammar();
-        foreach ($superAttributes as $superAttributeId => $superAttribute) {
-            $query = DB::table('catalog_product_super_link')
-                ->selectRaw('JSON_OBJECTAGG(' . $grammar->wrap($superAttribute) . ', JSON_OBJECT(
-                    "sort_order", `option`.`sort_order`,
-                    "label", ' . $grammar->wrap($superAttribute . '_value') . ',
-                    "value", ' . $grammar->wrap($superAttribute) . '
-                )) AS ' . $grammar->wrap($superAttribute))
-                ->join($model->getTable() . ' AS children', 'children.entity_id', '=', 'catalog_product_super_link.product_id')
-                ->join('catalog_product_super_attribute', function ($join) use ($superAttributeId) {
-                    $join->on('catalog_product_super_attribute.product_id', '=', 'catalog_product_super_link.parent_id')
-                        ->where('attribute_id', $superAttributeId);
-                })
-                ->join('eav_attribute_option AS option', 'option.option_id', '=', $superAttribute)
-                ->whereColumn('parent_id', $model->getTable() . '.entity_id')
-                ->whereNotNull($superAttribute);
-
-            $builder->selectSub($query, 'super_' . $superAttribute);
-        }
-
-        $query = DB::table('catalog_product_super_attribute')
-            ->selectRaw('JSON_OBJECTAGG(eav_attribute.attribute_id, JSON_OBJECT(
-                "code", `attribute_code`,
-                "label", COALESCE(NULLIF(`value`, ""), `frontend_label`),
-                "text_swatch", JSON_UNQUOTE(JSON_EXTRACT(IF(JSON_VALID(additional_data), additional_data, null), "$.swatch_input_type")) = "text",
-                "visual_swatch", JSON_UNQUOTE(JSON_EXTRACT(IF(JSON_VALID(additional_data), additional_data, null), "$.swatch_input_type")) = "visual",
-                "update_image", JSON_UNQUOTE(JSON_EXTRACT(IF(JSON_VALID(additional_data), additional_data, null), "$.update_product_preview_image")) = 1
-            )) AS `super_attributes`')
-            ->join('eav_attribute', 'eav_attribute.attribute_id', '=', 'catalog_product_super_attribute.attribute_id')
-            ->join('catalog_eav_attribute', 'catalog_eav_attribute.attribute_id', '=', 'catalog_product_super_attribute.attribute_id')
-            ->leftJoin('catalog_product_super_attribute_label', function ($join) {
-                $join
-                    ->on('catalog_product_super_attribute_label.product_super_attribute_id', '=', 'catalog_product_super_attribute.product_super_attribute_id')
-                    ->where('catalog_product_super_attribute_label.store_id', config('rapidez.store'));
-            })
-            ->whereColumn('product_id', $model->getTable() . '.entity_id')
-            ->orderBy('frontend_label')
-            ->orderBy('catalog_product_super_attribute.position');
-
-        $builder->selectSub($query, 'super_attributes');
-    }
-}
diff --git a/src/Models/SearchQuery.php b/src/Models/SearchQuery.php
index 5fa1c4eb4..98c392326 100644
--- a/src/Models/SearchQuery.php
+++ b/src/Models/SearchQuery.php
@@ -16,8 +16,6 @@ class SearchQuery extends Model
 
     protected $primaryKey = 'query_id';
 
-    protected $guarded = [];
-
     protected static function booting()
     {
         static::addGlobalScope('ForCurrentStore', fn (Builder $query) => $query->where('store_id', config('rapidez.store')));
diff --git a/src/Models/SearchSynonym.php b/src/Models/SearchSynonym.php
index 142604c59..0846032d3 100644
--- a/src/Models/SearchSynonym.php
+++ b/src/Models/SearchSynonym.php
@@ -10,6 +10,4 @@ class SearchSynonym extends Model
     protected $table = 'search_synonyms';
 
     protected $primaryKey = 'group_id';
-
-    protected $guarded = [];
 }
diff --git a/src/Models/SuperAttribute.php b/src/Models/SuperAttribute.php
new file mode 100644
index 000000000..464947db0
--- /dev/null
+++ b/src/Models/SuperAttribute.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Rapidez\Core\Models;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Casts\Attribute;
+
+class SuperAttribute extends Model
+{
+    protected $table = 'catalog_product_super_attribute';
+    protected $primaryKey = 'product_super_attribute_id';
+
+    protected $casts = [
+        'additional_data' => 'json',
+    ];
+
+    public static function boot()
+    {
+        parent::boot();
+
+        static::addGlobalScope('attribute', function (Builder $builder) {
+            $builder
+                ->leftJoin('eav_attribute', $builder->qualifyColumn('attribute_id'), '=', 'eav_attribute.attribute_id')
+                ->leftJoin('catalog_eav_attribute', $builder->qualifyColumn('attribute_id'), '=', 'catalog_eav_attribute.attribute_id');
+        });
+    }
+
+    /**
+     * @deprecated please use attribute_code
+     */
+    protected function code(): Attribute
+    {
+        return Attribute::get(
+            fn (): string => $this->attribute_code
+        );
+    }
+}
diff --git a/src/Models/Traits/HasAlternatesThroughRewrites.php b/src/Models/Traits/HasAlternatesThroughRewrites.php
index 3ca53aaac..32604bd7a 100644
--- a/src/Models/Traits/HasAlternatesThroughRewrites.php
+++ b/src/Models/Traits/HasAlternatesThroughRewrites.php
@@ -3,10 +3,21 @@
 namespace Rapidez\Core\Models\Traits;
 
 use Illuminate\Database\Eloquent\Casts\Attribute;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Rapidez\Core\Facades\Rapidez;
 
 trait HasAlternatesThroughRewrites
 {
+    abstract protected static function getEntityType(): string;
+
+    public function rewrites(): HasMany
+    {
+        return $this
+            ->hasMany(config('rapidez.models.rewrite'), 'entity_id')
+            ->withoutGlobalScope('store')
+            ->where('entity_type', static::getEntityType());
+    }
+
     protected function alternates(): Attribute
     {
         return Attribute::make(
diff --git a/src/Models/Traits/HasAttributeOptions.php b/src/Models/Traits/HasAttributeOptions.php
new file mode 100644
index 000000000..f3f4f9fbb
--- /dev/null
+++ b/src/Models/Traits/HasAttributeOptions.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Rapidez\Core\Models\Traits;
+
+use Illuminate\Database\Eloquent\Casts\Attribute;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+trait HasAttributeOptions
+{
+    protected static $hasAttributeOptions = true;
+    protected static $attributeCache = [];
+
+    protected function options(): Attribute
+    {
+        return Attribute::get(function () {
+            $store = config('rapidez.store');
+            $key = "store_{$store}.{$this->attribute_code}";
+
+            $value = data_get(static::$attributeCache, $key);
+            if ($value) {
+                return $value;
+            }
+
+            $value = $this->attributeOptions->keyBy('option_id');
+            data_set(static::$attributeCache, $key, $value);
+
+            return $value;
+        });
+    }
+
+    // TODO: Double check as it seem to query all values
+    // for each attribute and each product!
+    public function attributeOptions(): HasMany
+    {
+        // Sort by store_id first to always get the higher store id if there are two.
+        return $this->hasMany(config('rapidez.models.attribute_option'), 'attribute_id', 'attribute_id')->orderBy('store_id');
+    }
+}
diff --git a/src/Models/Traits/HasCustomAttributes.php b/src/Models/Traits/HasCustomAttributes.php
new file mode 100644
index 000000000..600c75aef
--- /dev/null
+++ b/src/Models/Traits/HasCustomAttributes.php
@@ -0,0 +1,202 @@
+<?php
+
+namespace Rapidez\Core\Models\Traits;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Casts\Attribute as AttributeCast;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Support\Arr;
+use Rapidez\Core\Models\Attribute;
+use Rapidez\Core\Models\AttributeDatetime;
+use Rapidez\Core\Models\AttributeDecimal;
+use Rapidez\Core\Models\AttributeInt;
+use Rapidez\Core\Models\AttributeText;
+use Rapidez\Core\Models\AttributeVarchar;
+
+trait HasCustomAttributes
+{
+    // Hide the EAV relations for serialization.
+    public function getHidden()
+    {
+        return array_merge(
+            parent::getHidden(),
+            $this->getCustomAttributeRelations()
+        );
+    }
+
+    // Add the EAV attributes for serialization.
+    public function toArray()
+    {
+        return array_merge(
+            $this->customAttributes->toArray(),
+            parent::toArray(),
+        );
+    }
+
+    protected function getCustomAttributeTypes(): array
+    {
+        return property_exists(self::class, 'attributeTypes')
+            ? $this->attributeTypes
+            : ['datetime', 'decimal', 'int', 'text', 'varchar'];
+    }
+
+    protected function getCustomAttributeRelations(): array
+    {
+        return Arr::map($this->getCustomAttributeTypes(), fn ($type) => 'attribute' . ucfirst($type));
+    }
+
+    protected function getCustomAttributeCode(): string
+    {
+        return property_exists(self::class, 'attributeCode')
+            ? $this->attributeCode
+            : 'attribute_code';
+    }
+
+    protected static function withCustomAttributes()
+    {
+        static::addGlobalScope('customAttributes', fn (Builder $builder) => $builder->withCustomAttributes());
+    }
+
+    public function scopeWithCustomAttributes(Builder $builder, ?callable $callback = null)
+    {
+        $relations = $this->getCustomAttributeRelations();
+        if ($callback) {
+            $relations = Arr::mapWithKeys($relations, fn ($relation) => [$relation => $callback]);
+        }
+
+        $builder->with($relations);
+    }
+
+    public function scopeAttributeHas(Builder $builder, string $attributeCode, callable $callback)
+    {
+        $type = Attribute::getCached()[$attributeCode]->backend_type ?? 'varchar';
+
+        return $builder->whereHas(
+            'attribute' . ucfirst($type),
+            $callback,
+        );
+    }
+
+    public function scopeWhereAttribute(Builder $builder, string $attributeCode, $operator = null, $value = null)
+    {
+        return $builder->attributeHas(
+            $attributeCode,
+            fn ($query) => $query
+                ->where('value', $operator, $value)
+                ->where($this->getCustomAttributeCode(), $attributeCode)
+        );
+    }
+
+    // TODO: This one is a bit a duplicate of the one above,
+    // can we re-use some code? What if another method
+    // is needed like whereBetween, whereNull, etc
+    public function scopeWhereInAttribute(Builder $builder, string $attributeCode, $values = null, $boolean = 'and', $not = false)
+    {
+        return $builder->attributeHas(
+            $attributeCode,
+            fn ($query) => $query
+                ->whereIn('value', $values, $boolean, $not)
+                ->where($this->getCustomAttributeCode(), $attributeCode)
+        );
+    }
+
+    public function attributeDatetime(): HasMany
+    {
+        return $this->hasManyWithAttributeTypeTable(
+            config('rapidez.models.attribute_datetime', AttributeDatetime::class),
+            'datetime',
+            $this->primaryKey,
+            $this->primaryKey,
+        );
+    }
+
+    public function attributeDecimal(): HasMany
+    {
+        return $this->hasManyWithAttributeTypeTable(
+            config('rapidez.models.attribute_decimal', AttributeDecimal::class),
+            'decimal',
+            $this->primaryKey,
+            $this->primaryKey,
+        );
+    }
+
+    public function attributeInt(): HasMany
+    {
+        return $this->hasManyWithAttributeTypeTable(
+            config('rapidez.models.attribute_int', AttributeInt::class),
+            'int',
+            $this->primaryKey,
+            $this->primaryKey,
+        );
+    }
+
+    public function attributeText(): HasMany
+    {
+        return $this->hasManyWithAttributeTypeTable(
+            config('rapidez.models.attribute_text', AttributeText::class),
+            'text',
+            $this->primaryKey,
+            $this->primaryKey,
+        );
+    }
+
+    public function attributeVarchar(): HasMany
+    {
+        return $this->hasManyWithAttributeTypeTable(
+            config('rapidez.models.attribute_varchar', AttributeVarchar::class),
+            'varchar',
+            $this->primaryKey,
+            $this->primaryKey,
+        );
+    }
+
+    public function hasManyWithAttributeTypeTable($class, $type, $foreignKey = null, $localKey = null): HasMany
+    {
+        $table = property_exists(self::class, 'attributeTablePrefix')
+            ? $this->attributeTablePrefix
+            : $this->table;
+
+        $table .= '_' . $type;
+
+        // Set the relation with the custom table
+        $relation = $this->hasMany($class, $foreignKey, $localKey);
+        $relation->getModel()->setTable($table);
+        $relation->getQuery()->from($table);
+
+        return $this->modifyRelation($relation);
+    }
+
+    protected function modifyRelation(HasMany $relation): HasMany
+    {
+        return $relation;
+    }
+
+    public function customAttributes(): AttributeCast
+    {
+        return AttributeCast::get(function () {
+            $data = collect();
+
+            foreach ($this->getCustomAttributeRelations() as $relation) {
+                if ($values = $this->$relation) {
+                    $data->push(...$values);
+                }
+
+                // TODO: Double check if this is actually useful
+                // it could improve performance / reduce memory
+                // $this->unsetRelation($relation);
+            }
+
+            return $data->keyBy($this->getCustomAttributeCode());
+        })->shouldCache();
+    }
+
+    public function getCustomAttribute($key)
+    {
+        return $this->customAttributes[$key] ?? null;
+    }
+
+    protected function throwMissingAttributeExceptionIfApplicable($key)
+    {
+        return $this->getCustomAttribute($key);
+    }
+}
diff --git a/src/Models/Traits/Product/BackwardsCompatibleAccessors.php b/src/Models/Traits/Product/BackwardsCompatibleAccessors.php
new file mode 100644
index 000000000..e13b719ad
--- /dev/null
+++ b/src/Models/Traits/Product/BackwardsCompatibleAccessors.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Rapidez\Core\Models\Traits\Product;
+
+use Illuminate\Database\Eloquent\Casts\Attribute;
+
+trait BackwardsCompatibleAccessors
+{
+    /**
+     * @deprecated please use $product->stock->min_sale_qty
+     */
+    protected function minSaleQty(): Attribute
+    {
+        return Attribute::get(fn () => $this->stock->min_sale_qty);
+    }
+
+    /**
+     * @deprecated please use $product->stock->max_sale_qty
+     */
+    protected function maxSaleQty(): Attribute
+    {
+        return Attribute::get(fn () => $this->stock->max_sale_qty);
+    }
+
+    /**
+     * @deprecated please use $product->stock->qty_increments
+     */
+    protected function qtyIncrements(): Attribute
+    {
+        return Attribute::get(fn () => $this->stock->qty_increments);
+    }
+
+    /**
+     * @deprecated please use $product->stock->is_in_stock
+     */
+    protected function inStock(): Attribute
+    {
+        return Attribute::get(fn () => $this->stock->is_in_stock);
+    }
+
+    /**
+     * @deprecated please use $product->reviewSummary->reviews_count
+     */
+    protected function reviewsCount(): Attribute
+    {
+        return Attribute::get(fn () => $this->reviewSummary->reviews_count);
+    }
+
+    /**
+     * @deprecated please use $product->reviewSummary->rating_summary
+     */
+    protected function reviewsScore(): Attribute
+    {
+        return Attribute::get(fn () => $this->reviewSummary->rating_summary);
+    }
+}
diff --git a/src/Models/Traits/Product/CastMultiselectAttributes.php b/src/Models/Traits/Product/CastMultiselectAttributes.php
deleted file mode 100644
index cee2604d1..000000000
--- a/src/Models/Traits/Product/CastMultiselectAttributes.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace Rapidez\Core\Models\Traits\Product;
-
-use Illuminate\Support\Arr;
-use Rapidez\Core\Casts\Multiselect;
-
-trait CastMultiselectAttributes
-{
-    protected function getMultiselectAttributeCasts(): array
-    {
-        $attributeModel = config('rapidez.models.attribute');
-        $multiselectAttributes = Arr::pluck($attributeModel::getCachedWhere(function ($attribute) {
-            return $attribute['input'] == 'multiselect';
-        }), 'code');
-
-        foreach ($multiselectAttributes as $multiselectAttribute) {
-            $casts[$multiselectAttribute] = Multiselect::class;
-        }
-
-        return $casts ?? [];
-    }
-}
diff --git a/src/Models/Traits/Product/CastSuperAttributes.php b/src/Models/Traits/Product/CastSuperAttributes.php
deleted file mode 100644
index e3c2faaf4..000000000
--- a/src/Models/Traits/Product/CastSuperAttributes.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Rapidez\Core\Models\Traits\Product;
-
-use Illuminate\Support\Arr;
-
-trait CastSuperAttributes
-{
-    protected function getSuperAttributeCasts(): array
-    {
-        $attributeModel = config('rapidez.models.attribute');
-        $superAttributes = Arr::pluck($attributeModel::getCachedWhere(function ($attribute) {
-            return $attribute['super'] && $attribute['flat'];
-        }), 'code');
-
-        foreach ($superAttributes as $superAttribute) {
-            $casts['super_' . $superAttribute] = 'object';
-        }
-
-        $casts['super_attributes'] = 'object';
-
-        return $casts;
-    }
-}
diff --git a/src/Models/Traits/Product/HasSuperAttributes.php b/src/Models/Traits/Product/HasSuperAttributes.php
new file mode 100644
index 000000000..2791dd631
--- /dev/null
+++ b/src/Models/Traits/Product/HasSuperAttributes.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Rapidez\Core\Models\Traits\Product;
+
+use Illuminate\Database\Eloquent\Casts\Attribute;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+trait HasSuperAttributes
+{
+    /**
+     * @deprecated please use superAttributes
+     */
+    public function super_attributes(): HasMany
+    {
+        return $this->superAttributes();
+    }
+
+    public function superAttributes(): HasMany
+    {
+        return $this->hasMany(
+            config('rapidez.models.super_attribute'),
+            'product_id',
+        )->orderBy('catalog_product_super_attribute.position');
+    }
+
+    public function getSuperAttributesAttribute()
+    {
+        return $this->getRelationValue('superAttributes')->keyBy('attribute_id');
+    }
+
+    public function superAttributeValues(): Attribute
+    {
+        return Attribute::get(function () {
+            return $this->superAttributes
+                ->sortBy('position')
+                ->mapWithKeys(fn ($attribute) => [
+                    $attribute->attribute_code => $this->children->mapWithKeys(function ($child) use ($attribute) {
+                        return [$child->entity_id => $child->{$attribute->attribute_code}];
+                    })
+                        ->unique('value')
+                        ->sortBy('sort_order'),
+                ]);
+        });
+    }
+}
diff --git a/src/Models/Traits/Product/Searchable.php b/src/Models/Traits/Product/Searchable.php
index f218a7fdd..963cd0df9 100644
--- a/src/Models/Traits/Product/Searchable.php
+++ b/src/Models/Traits/Product/Searchable.php
@@ -6,8 +6,10 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Cache;
 use Rapidez\Core\Facades\Rapidez;
+use Rapidez\Core\Models\AbstractAttribute;
 use Rapidez\Core\Models\Category;
 use Rapidez\Core\Models\CategoryProduct;
+use Rapidez\Core\Models\EavAttribute;
 use Rapidez\Core\Models\Product;
 use Rapidez\Core\Models\Traits\Searchable as ParentSearchable;
 use TorMorten\Eventy\Facades\Eventy;
@@ -21,8 +23,16 @@ trait Searchable
      */
     protected function makeAllSearchableUsing(Builder $query)
     {
-        return $query->selectOnlyIndexable()
-            ->with(['categoryProducts', 'reviewSummary'])
+        return $query
+            ->with(['reviewSummary', 'children'])
+            ->whereInAttribute('visibility', [
+                // TODO: Are we filtering this on the frontend?
+                // As "searchable" will be used for the
+                // listing and the search...
+                Product::VISIBILITY_IN_CATALOG,
+                Product::VISIBILITY_IN_SEARCH,
+                Product::VISIBILITY_BOTH,
+            ])
             ->withEventyGlobalScopes('index.' . static::getModelName() . '.scopes');
     }
 
@@ -31,16 +41,9 @@ protected function makeAllSearchableUsing(Builder $query)
      */
     public function shouldBeSearchable(): bool
     {
-        if (! in_array($this->visibility, [
-            Product::VISIBILITY_IN_CATALOG,
-            Product::VISIBILITY_IN_SEARCH,
-            Product::VISIBILITY_BOTH,
-        ])) {
-            return false;
-        }
-
+        // TODO: Maybe also move this one to the query?
         $showOutOfStock = (bool) Rapidez::config('cataloginventory/options/show_out_of_stock', 0);
-        if (! $showOutOfStock && ! $this->in_stock) {
+        if (! $showOutOfStock && ! $this->stock->is_in_stock) {
             return false;
         }
 
@@ -52,9 +55,24 @@ public function shouldBeSearchable(): bool
      */
     public function toSearchableArray(): array
     {
-        $data = $this->toArray();
+        $indexableAttributeCodes = EavAttribute::getCachedIndexable()
+            ->pluck($this->getCustomAttributeCode())
+            ->toArray();
+
+        $data = Arr::only($this->toArray(), [
+            'entity_id',
+            'sku',
+            'children',
+            'url',
+            'in_stock',
+            'min_sale_qty',
+            'qty_increments',
+            ...$indexableAttributeCodes,
+            ...$this->superAttributes->pluck('attribute_code'),
+        ]);
 
         $data['store'] = config('rapidez.store');
+        $data['super_attributes'] = $this->superAttributes->keyBy('attribute_id');
 
         $maxPositions = Cache::driver('array')->rememberForever('max-positions-' . config('rapidez.store'), function () {
             return CategoryProduct::query()
@@ -64,10 +82,8 @@ public function toSearchableArray(): array
                 ->pluck('position', 'category_id');
         });
 
-        foreach ($this->super_attributes ?: [] as $superAttribute) {
-            $data['super_' . $superAttribute->code] = $superAttribute->text_swatch || $superAttribute->visual_swatch
-                ? array_keys((array) $this->{'super_' . $superAttribute->code})
-                : Arr::pluck($this->{'super_' . $superAttribute->code} ?: [], 'label');
+        foreach ($this->superAttributeValues as $attribute => $values) {
+            $data['super_' . $attribute] = $values->pluck('value');
         }
 
         $data = $this->withCategories($data);
@@ -80,33 +96,59 @@ public function toSearchableArray(): array
         return Eventy::filter('index.' . static::getModelName() . '.data', $data, $this);
     }
 
+    // TODO: This isn't used anymore, can we work with the
+    // current data? Do we really need this value/label?
+    public function transformAttributes(array $data): array
+    {
+        // TODO: Can this be done directly from AbstractAttribute instead?
+        // Would be a lot cleaner if we don't have to manually loop through this.
+        return Arr::map($data, function ($value, $key) {
+            if ($value instanceof AbstractAttribute) {
+                if ($value->value == $value->label) {
+                    return $value->value;
+                } else {
+                    return [
+                        'value' => $value->value,
+                        'label' => $value->label,
+                    ];
+                }
+            } elseif ($key === 'children') {
+                return $value->map(fn ($child) => $this->transformAttributes($child));
+            } else {
+                return $value;
+            }
+        });
+    }
+
     /**
      * Add the category paths
      */
     public function withCategories(array $data): array
     {
-        $categories = Cache::driver('array')->rememberForever('categories-' . config('rapidez.store'), function () {
-            return Category::withEventyGlobalScopes('index.' . config('rapidez.models.category')::getModelName() . '.scopes')
-                ->where('catalog_category_flat_store_' . config('rapidez.store') . '.entity_id', '<>', config('rapidez.root_category_id'))
-                ->pluck('name', 'entity_id');
+        $categories = Cache::driver('array')->rememberForever('categories', function () {
+            return Category::all()->keyBy('entity_id');
         });
 
-        foreach ($data['category_paths'] as $categoryPath) {
-            $paths = explode('/', $categoryPath);
-            $paths = array_slice($paths, array_search(config('rapidez.root_category_id'), $paths) + 1);
+        foreach ($this->breadcrumbCategories as $category) {
+            if (! $category) {
+                continue;
+            }
 
-            $categoryHierarchy = [];
-            $currentPath = '';
+            $path = array_slice(explode('/', $category->path), 2);
+            $level = count($path);
 
-            foreach ($paths as $categoryId) {
-                if (isset($categories[$categoryId])) {
-                    $currentPath .= ($currentPath ? ' > ' : '') . $categories[$categoryId];
-                    $categoryHierarchy[] = $currentPath;
-                }
+            if ($level < 1) {
+                continue;
             }
 
-            foreach ($categoryHierarchy as $level => $category) {
-                $data['category_lvl' . ($level + 1)][] = $category;
+            for ($i = 1; $i <= $level; $i++) {
+                $pathCategories = collect($path)
+                    ->take($i)
+                    ->map(fn ($id) => $categories[$id]->name ?? null)
+                    ->whereNotNull()
+                    ->join(' > ');
+
+                $data['category_lvl' . $i][] = $pathCategories;
             }
         }
 
diff --git a/src/Models/Traits/Product/SelectAttributeScopes.php b/src/Models/Traits/Product/SelectAttributeScopes.php
deleted file mode 100644
index eadbaab5d..000000000
--- a/src/Models/Traits/Product/SelectAttributeScopes.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-namespace Rapidez\Core\Models\Traits\Product;
-
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Arr;
-use TorMorten\Eventy\Facades\Eventy;
-
-trait SelectAttributeScopes
-{
-    public function scopeSelectAttributes(Builder $query, array $attributes): Builder
-    {
-        $this->attributesToSelect = $attributes;
-
-        return $query;
-    }
-
-    public function scopeSelectForProductPage(Builder $query): Builder
-    {
-        $attributeModel = config('rapidez.models.attribute');
-        $this->attributesToSelect = Arr::pluck($attributeModel::getCachedWhere(function ($attribute) {
-            return $attribute['productpage'] || in_array($attribute['code'], [
-                'name',
-                'meta_title',
-                'meta_description',
-                'price',
-                'special_price',
-                'special_from_date',
-                'special_to_date',
-                'description',
-                'url_key',
-            ]);
-        }), 'code');
-
-        return $query;
-    }
-
-    public function scopeSelectOnlyComparable(Builder $query): Builder
-    {
-        $attributeModel = config('rapidez.models.attribute');
-        $this->attributesToSelect = Arr::pluck($attributeModel::getCachedWhere(function ($attribute) {
-            return $attribute['compare'] || in_array($attribute['code'], ['name']);
-        }), 'code');
-
-        return $query;
-    }
-
-    public function scopeSelectOnlyIndexable(Builder $query): Builder
-    {
-        $attributeModel = config('rapidez.models.attribute');
-        $this->attributesToSelect = Arr::pluck($attributeModel::getCachedWhere(function ($attribute) {
-            if (in_array($attribute['code'], ['msrp_display_actual_price_type', 'price_view', 'shipment_type', 'status'])) {
-                return false;
-            }
-
-            if ($attribute['listing'] || $attribute['filter'] || $attribute['search'] || $attribute['sorting']) {
-                return true;
-            }
-
-            $alwaysInFlat = array_merge(['sku'], Eventy::filter('index.' . static::getModelName() . '.attributes', []));
-            if (in_array($attribute['code'], $alwaysInFlat)) {
-                return true;
-            }
-
-            return false;
-        }), 'code');
-
-        return $query;
-    }
-}
diff --git a/src/RapidezServiceProvider.php b/src/RapidezServiceProvider.php
index 1b2fbfbeb..50cbb0cf8 100644
--- a/src/RapidezServiceProvider.php
+++ b/src/RapidezServiceProvider.php
@@ -46,6 +46,7 @@
 class RapidezServiceProvider extends ServiceProvider
 {
     protected $configFiles = [
+        'attribute-models',
         'frontend',
         'healthcheck',
         'jwt',
diff --git a/tests/Feature/ConfigTest.php b/tests/Feature/ConfigTest.php
index 8776bbf62..0c7f2c501 100644
--- a/tests/Feature/ConfigTest.php
+++ b/tests/Feature/ConfigTest.php
@@ -2,15 +2,14 @@
 
 namespace Rapidez\Core\Tests\Feature;
 
+use PHPUnit\Framework\Attributes\Test;
 use Rapidez\Core\Facades\Rapidez;
 use Rapidez\Core\Models\Config;
 use Rapidez\Core\Tests\TestCase;
 
 class ConfigTest extends TestCase
 {
-    /**
-     * @test
-     */
+    #[Test]
     public function config_can_be_intentionally_null()
     {
         $test = Config::create([
diff --git a/tests/Feature/ProductTest.php b/tests/Feature/ProductTest.php
deleted file mode 100644
index 1f39e24e1..000000000
--- a/tests/Feature/ProductTest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Rapidez\Core\Tests\Feature;
-
-use Rapidez\Core\Models\Product;
-use Rapidez\Core\Tests\TestCase;
-
-class ProductTest extends TestCase
-{
-    /**
-     * @test
-     */
-    public function supported_product_types_can_be_received()
-    {
-        foreach (['simple', 'configurable', 'downloadable', 'grouped'] as $supportedType) {
-            $this->assertInstanceOf(
-                Product::class,
-                Product::selectAttributes(['sku'])->where((new Product)->getTable() . '.type_id', $supportedType)->first()
-            );
-        }
-    }
-
-    /**
-     * @test
-     */
-    public function unsupported_product_types_can_not_be_received()
-    {
-        foreach (['bundle'] as $unsupportedType) {
-            $this->assertNull(Product::selectAttributes(['sku'])->where((new Product)->getTable() . '.type_id', $unsupportedType)->first());
-        }
-    }
-}
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 5439a6e11..f43f91015 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -2,6 +2,7 @@
 
 namespace Rapidez\Core\Tests;
 
+use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Schema;
 use Orchestra\Testbench\TestCase as BaseTestCase;
 use Rapidez\Core\Facades\Rapidez;
@@ -11,11 +12,15 @@
 
 class TestCase extends BaseTestCase
 {
+    use DatabaseTransactions;
+
     public function setUp(): void
     {
         parent::setUp();
 
         $this->setUpDatabase($this->app);
+
+        Rapidez::setStore(1);
     }
 
     protected function getPackageProviders($app)
diff --git a/tests/Unit/.gitkeep b/tests/Unit/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/Unit/ProductPriceTest.php b/tests/Unit/ProductPriceTest.php
new file mode 100644
index 000000000..49dcf78d3
--- /dev/null
+++ b/tests/Unit/ProductPriceTest.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Rapidez\Core\Tests\Feature;
+
+use PHPUnit\Framework\Attributes\Test;
+use Rapidez\Core\Models\Product;
+use Rapidez\Core\Tests\TestCase;
+
+class ProductPriceTest extends TestCase
+{
+    #[Test]
+    public function product_has_prices()
+    {
+        $product = Product::find(10);
+
+        $this->assertEquals(32.0, (float) $product->customAttributes['price']->value);
+        $this->assertEquals(24.0, (float) $product->customAttributes['special_price']->value);
+
+        $this->assertEquals(32.0, (float) $product->price);
+        $this->assertEquals(32.0, (float) $product->toArray()['price']);
+
+        $this->assertEquals(24.0, (float) $product->special_price);
+        $this->assertEquals(24.0, (float) $product->toArray()['special_price']);
+    }
+
+    #[Test]
+    public function product_equal_special_price_is_null()
+    {
+        $product = Product::find(2);
+
+        $this->assertEquals(32.0, (float) $product->customAttributes['price']->value);
+        $this->assertEquals(32.0, (float) $product->customAttributes['special_price']->value);
+
+        $this->assertEquals(32.0, (float) $product->price);
+        $this->assertEquals(32.0, (float) $product->toArray()['price']);
+
+        $this->assertNull($product->special_price);
+        $this->assertNull($product->toArray()['special_price']);
+    }
+
+    #[Test]
+    public function product_catalog_price_rules_apply()
+    {
+        // There is a rule: "20% off all Women’s and Men’s Pants"
+        $product = Product::find(737);
+
+        $this->assertEquals(35.0, (float) $product->customAttributes['price']->value);
+        $this->assertEquals(35.0, (float) $product->price);
+        $this->assertEquals(35.0, (float) $product->toArray()['price']);
+
+        $this->assertEquals(28.0, (float) $product->special_price);
+        $this->assertEquals(28.0, (float) $product->toArray()['special_price']);
+    }
+
+    #[Test]
+    public function product_can_have_tier_prices()
+    {
+        $this->assertTrue(true);
+        // TODO: Base DB doesn't have tier prices. Test this some other way.
+    }
+}
diff --git a/tests/Unit/ProductTest.php b/tests/Unit/ProductTest.php
new file mode 100644
index 000000000..056fadacb
--- /dev/null
+++ b/tests/Unit/ProductTest.php
@@ -0,0 +1,190 @@
+<?php
+
+namespace Rapidez\Core\Tests\Feature;
+
+use PHPUnit\Framework\Attributes\Test;
+use Rapidez\Core\Events\ProductViewEvent;
+use Rapidez\Core\Models\Config;
+use Rapidez\Core\Models\Product;
+use Rapidez\Core\Tests\TestCase;
+
+class ProductTest extends TestCase
+{
+    #[Test]
+    public function products_can_be_retrieved()
+    {
+        foreach (['simple', 'configurable', 'downloadable', 'grouped'] as $supportedType) {
+            $this->assertInstanceOf(
+                Product::class,
+                Product::firstWhere('type_id', $supportedType),
+                'Products of type ' . $supportedType . ' are not being retrieved.',
+            );
+        }
+    }
+
+    #[Test]
+    public function disabled_products_cannot_be_retrieved()
+    {
+        $this->assertEquals(0, Product::whereAttribute('status', 0)->count(), 'Disabled products are being retrieved by default.');
+    }
+
+    #[Test]
+    public function product_has_gallery()
+    {
+        $product = Product::find(100);
+
+        $this->assertNotNull($product->gallery, 'Product 100 does not have a gallery.');
+        $this->assertEquals(3, count($product->gallery), 'Product 100 does not have 3 images in the gallery.');
+        $this->assertEquals(3, count($product->images), 'Product 100 does not have 3 images in the images collection.');
+    }
+
+    #[Test]
+    public function product_can_have_children_and_multiple_parents()
+    {
+        $product = Product::find(45);
+
+        $this->assertNotNull($product->children, 'Product 45 does not have children.');
+        $this->assertEquals(3, count($product->children), 'Product 45 does not have 3 children.');
+        $this->assertEquals(2, count($product->children->first()->parents), 'Product 45\'s first child does not have 2 parents.');
+    }
+
+    #[Test]
+    public function product_can_have_upsells_and_crosssells()
+    {
+        $product = Product::find(1578);
+
+        $this->assertEquals(8, $product->getLinkedProducts('up_sell')->count(), 'Product 1578 does not have 8 upsells.');
+        $this->assertEquals(4, $product->getLinkedProducts('cross_sell')->count(), 'Product 1578 does not have 4 crosssells.');
+    }
+
+    #[Test]
+    public function product_can_have_categories()
+    {
+        $product = Product::find(847);
+
+        $this->assertEquals(6, $product->categoryProducts->count(), 'Product 847 does not have 6 categories attached.');
+    }
+
+    #[Test]
+    public function product_has_stock_data()
+    {
+        $product = Product::find(99);
+
+        $this->assertNotNull($product->stock, 'Product 99 does not have stock data.');
+        $this->assertEquals(100, $product->stock->qty, 'Product 99 does not have 100 items in stock.');
+        $this->assertTrue($product->stock->is_in_stock, 'Product 99 is not in stock.');
+        $this->assertEquals(1, $product->stock->min_sale_qty, 'Product 99 does not have a min sale qty of 1.');
+    }
+
+    #[Test]
+    public function product_can_have_options()
+    {
+        // TODO: We should also visually test this!
+        // We could create feature tests for that
+        // but Playwright is better: RAP-1541
+        $product = Product::find(3);
+
+        $name = $product->options()->create(['type' => 'field']);
+        $name->titles()->create(['title' => 'Name', 'store_id' => 0]);
+        $name->titles()->create(['title' => 'Naam', 'store_id' => 1]);
+        $name->prices()->create(['price' => 5, 'store_id' => 0]);
+        $name->prices()->create(['price' => 10, 'store_id' => 1]);
+
+        $description = $product->options()->create(['type' => 'area']);
+        $description->titles()->create(['title' => 'Description']);
+        $description->prices()->create(['price' => 20, 'price_type' => 'percent']);
+
+        $color = $product->options()->create(['type' => 'drop_down']);
+        $color->titles()->create(['title' => 'Color']);
+
+        $red = $color->values()->create();
+        $red->titles()->create(['title' => 'Red', 'store_id' => 0]);
+        $red->titles()->create(['title' => 'Rood', 'store_id' => 1]);
+        $red->prices()->create(['price' => 1]);
+
+        $blue = $color->values()->create();
+        $blue->titles()->create(['title' => 'Blue']);
+        $blue->prices()->create(['price' => 5, 'store_id' => 0]);
+        $blue->prices()->create(['price' => 2.5, 'store_id' => 1]);
+
+        $options = $product->options()->get();
+
+        $this->assertEquals(3, $options->count());
+
+        $this->assertEquals('Naam', $options->get(0)->title);
+        $this->assertEquals('+ €10.00', $options->get(0)->price_label);
+
+        $this->assertEquals('Description', $options->get(1)->title);
+        $this->assertEquals('+ 20%', $options->get(1)->price_label);
+
+        $dropdown = $options->get(2)->values;
+
+        $this->assertEquals('Rood', $dropdown->get(0)->title);
+        $this->assertEquals('+ €1.00', $dropdown->get(0)->price_label);
+
+        $this->assertEquals('Blue', $dropdown->get(1)->title);
+        $this->assertEquals('+ €2.50', $dropdown->get(1)->price_label);
+    }
+
+    #[Test]
+    public function product_can_have_review_data()
+    {
+        $product = Product::find(37);
+
+        $this->assertNotNull($product->reviewSummary, 'Product 37 does not have review data.');
+        $this->assertEquals(3, $product->reviewSummary->reviews_count, 'Product 37 does not have 3 reviews in the summary.');
+        $this->assertEquals(87, $product->reviewSummary->rating_summary, 'Product 37 does not have an average review score of 87 in the summary.');
+    }
+
+    #[Test]
+    public function product_can_have_views()
+    {
+        // Enable the reports
+        Config::create(['path' => 'reports/options/enabled', 'value' => 1]);
+        Config::create(['path' => 'reports/options/product_view_enabled', 'value' => 1]);
+
+        $product = Product::find(1);
+
+        $this->assertEquals(0, $product->views()->count());
+
+        ProductViewEvent::dispatch($product);
+        ProductViewEvent::dispatch($product);
+
+        $this->assertEquals(2, $product->views()->count());
+    }
+
+    #[Test]
+    public function product_has_custom_attributes()
+    {
+        $product = Product::find(10);
+
+        $this->assertEqualsCanonicalizing([8, 11], iterator_to_array($product->activity->value), 'Activity attribute on product 10 did not return the right values.');
+        $this->assertEquals('Gym, Yoga', $product->activity->label, 'Activity attribute on product 10 did not yield the right text output.');
+
+        $this->assertEquals('Savvy Shoulder Tote', $product->name->label, 'Name attribute on product 10 did not return the right value.');
+        $this->assertEquals($product->name->label, $product->name, 'Product name did not return the right value or did not cast its value correctly.');
+    }
+
+    #[Test]
+    public function product_indexes_custom_attributes()
+    {
+        $product = Product::find(68);
+
+        $data = $product->toSearchableArray();
+
+        $this->assertEquals('All-Weather, Cool, Indoor, Spring, Windy', $data['climate']['label'], 'Product 68 did not get indexed with the right climate label.');
+        $this->assertEquals('Chaz Kangeroo Hoodie', $data['name'], 'Product 68 did not get indexed with the right name.');
+    }
+
+    #[Test]
+    public function product_indexes_super_attributes()
+    {
+        $product = Product::find(68);
+
+        $data = $product->toSearchableArray();
+        $firstChild = $data['children'][53];
+
+        $this->assertEquals(['value' => 166, 'label' => 'XS'], $firstChild['size'], 'Child product under product 68 did not get indexed with the right size data.');
+
+    }
+}
diff --git a/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-Mobile-Chrome-linux.png b/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-Mobile-Chrome-linux.png
index 2ab755046..2e10d5bbe 100644
--- a/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-Mobile-Chrome-linux.png
+++ b/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-Mobile-Chrome-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c6212ecf8bf76a4ba40ecf0d9d176acc469a190399d537c7f177a75c6c55eb13
-size 380503
+oid sha256:b3d2c3afe8d56bc2c89d81539c06d42da428b802e7ce664c770521f18b93e8db
+size 382891
diff --git a/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-Mobile-Safari-linux.png b/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-Mobile-Safari-linux.png
index 579b9be04..04f5dee5f 100644
--- a/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-Mobile-Safari-linux.png
+++ b/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-Mobile-Safari-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d03cea220e6a0caba8f507e5f20eb17b8e4c4e79b1b9e4fa6fceef4d868d7232
-size 415679
+oid sha256:09a60719b9e5f3bb631e5116cb0016aed1e209628029609a2c12fcc9fc1e29db
+size 418104
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-guest-4-Mobile-Chrome-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-guest-4-Mobile-Chrome-linux.png
index fdaa4233d..3852b8c11 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-guest-4-Mobile-Chrome-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-guest-4-Mobile-Chrome-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ca4df5f9bab81b6245843813b4fdd80d35ee7adb82f99ff3f5db4b5f2d759bcc
-size 118687
+oid sha256:daa208dcbbd85f6d42520b5921d415666b946843ac926c220c1168db0acb65d5
+size 119503
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-guest-4-Mobile-Safari-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-guest-4-Mobile-Safari-linux.png
index 37438bb2a..10411cead 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-guest-4-Mobile-Safari-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-guest-4-Mobile-Safari-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8605a81daa646cc30533a71c83a2647dff1908f3c28f26d9e901e6975ef1a647
-size 132079
+oid sha256:e31b548941472a6cb153c76afc491a1b50339b5bd5269bbc24c24795d7ff7013
+size 128993
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-guest-4-chromium-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-guest-4-chromium-linux.png
index 08eb0b1fe..e74157e7c 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-guest-4-chromium-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-guest-4-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5af6db802edd0fe62be3c976ca6679001625b4cfdfbdc479dc9cfc372df9a29b
-size 120092
+oid sha256:ee1a98073c87a2a07ae17b63994c0145a15f7ecf17adf08530a5dbb78b995ecc
+size 116351
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-guest-4-firefox-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-guest-4-firefox-linux.png
index 51bdf5d9a..7c2129558 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-guest-4-firefox-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-guest-4-firefox-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d8c5e4368f47253d1ce0172d7fe869e1bb70c0e077ce3d1cc57456cf7518fc7
-size 161983
+oid sha256:500f4e137e2f8882ef3a964ab9135b7b04dc17433282ce84968c22e2d1f02204
+size 154510
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-guest-4-webkit-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-guest-4-webkit-linux.png
index 6900ebb9c..1a5288ce0 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-guest-4-webkit-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-guest-4-webkit-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:694f8bd29cd8ed8d6f9933429f0924e3cf29b951dbc013b11eb2c54933cc81a9
-size 138691
+oid sha256:f30db2d1a914159f52be9559b1efd2d1b567ea5668b568db3f9de75271fe961f
+size 129137
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-3-Mobile-Chrome-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-3-Mobile-Chrome-linux.png
index fdaa4233d..3852b8c11 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-3-Mobile-Chrome-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-3-Mobile-Chrome-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ca4df5f9bab81b6245843813b4fdd80d35ee7adb82f99ff3f5db4b5f2d759bcc
-size 118687
+oid sha256:daa208dcbbd85f6d42520b5921d415666b946843ac926c220c1168db0acb65d5
+size 119503
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-3-Mobile-Safari-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-3-Mobile-Safari-linux.png
index 37438bb2a..10411cead 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-3-Mobile-Safari-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-3-Mobile-Safari-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8605a81daa646cc30533a71c83a2647dff1908f3c28f26d9e901e6975ef1a647
-size 132079
+oid sha256:e31b548941472a6cb153c76afc491a1b50339b5bd5269bbc24c24795d7ff7013
+size 128993
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-3-chromium-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-3-chromium-linux.png
index 08eb0b1fe..e74157e7c 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-3-chromium-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-3-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5af6db802edd0fe62be3c976ca6679001625b4cfdfbdc479dc9cfc372df9a29b
-size 120092
+oid sha256:ee1a98073c87a2a07ae17b63994c0145a15f7ecf17adf08530a5dbb78b995ecc
+size 116351
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-3-firefox-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-3-firefox-linux.png
index 51bdf5d9a..7c2129558 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-3-firefox-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-3-firefox-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d8c5e4368f47253d1ce0172d7fe869e1bb70c0e077ce3d1cc57456cf7518fc7
-size 161983
+oid sha256:500f4e137e2f8882ef3a964ab9135b7b04dc17433282ce84968c22e2d1f02204
+size 154510
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-3-webkit-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-3-webkit-linux.png
index 6900ebb9c..1a5288ce0 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-3-webkit-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-3-webkit-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:694f8bd29cd8ed8d6f9933429f0924e3cf29b951dbc013b11eb2c54933cc81a9
-size 138691
+oid sha256:f30db2d1a914159f52be9559b1efd2d1b567ea5668b568db3f9de75271fe961f
+size 129137