diff --git a/composer.json b/composer.json
index aef4155..ad84190 100644
--- a/composer.json
+++ b/composer.json
@@ -33,8 +33,8 @@
         "php": "^8.1",
         "justbetter/statamic-glide-directive": "^3.0",
         "rapidez/blade-directives": "^1.0",
-        "rapidez/core": "^4.0",
-        "rapidez/sitemap": "^4.0",
+        "rapidez/core": "^5.0",
+        "rapidez/sitemap": "^5.0",
         "spatie/once": "*",
         "statamic-rad-pack/runway": "^8.3",
         "statamic/cms": "^5.55",
diff --git a/resources/js/components/FormConditions.vue b/resources/js/components/FormConditions.vue
index a3c23b5..f9ce30d 100644
--- a/resources/js/components/FormConditions.vue
+++ b/resources/js/components/FormConditions.vue
@@ -1,6 +1,8 @@
 <script>
 import '/public/vendor/statamic/frontend/js/helpers.js'
-Vue.prototype.Statamic = window.Statamic
+if (window?.app?.config?.globalProperties) {
+    window.app.config.globalProperties.Statamic = window.Statamic
+}
 
 export default {
     props: {
@@ -15,7 +17,7 @@ export default {
         };
     },
     render() {
-        return this.$scopedSlots.default({
+        return this?.$slots?.default?.({
             formData: this.formData
         });
     },
diff --git a/resources/js/components/FormSubmission.vue b/resources/js/components/FormSubmission.vue
index 828a6f7..4efaf84 100644
--- a/resources/js/components/FormSubmission.vue
+++ b/resources/js/components/FormSubmission.vue
@@ -1,6 +1,8 @@
 <script>
 import '/public/vendor/statamic/frontend/js/helpers.js'
-Vue.prototype.Statamic = window.Statamic
+if (window?.app?.config?.globalProperties) {
+    window.app.config.globalProperties.Statamic = window.Statamic
+}
 
 export default {
     props: {
@@ -15,14 +17,14 @@ export default {
         };
     },
     render() {
-        return this.$scopedSlots.default({
+        return this?.$slots?.default?.({
             submit: this.submit,
             success: this.success,
             error: this.error
         });
     },
     mounted() {
-        let token = this.$root.csrfToken
+        let token = window?.app?.config?.globalProperties?.csrfToken
         let csrfField = this.$el.querySelector('input[value="STATAMIC_CSRF_TOKEN"]')
 
         if (csrfField && token && token !== 'STATAMIC_CSRF_TOKEN') {
diff --git a/resources/js/package.js b/resources/js/package.js
index 3bde87d..abe25ae 100644
--- a/resources/js/package.js
+++ b/resources/js/package.js
@@ -1,8 +1,16 @@
 import 'Vendor/rapidez/core/resources/js/vue'
 
-Vue.component('form-conditions', () => import('./components/FormConditions.vue'));
-Vue.component('form-submission', () => import('./components/FormSubmission.vue'));
+document.addEventListener('vue:loaded', (e) => {
+    const vue = e.detail.vue
+    vue.component('form-conditions', () => import('./components/FormConditions.vue'))
+    vue.component('form-submission', () => import('./components/FormSubmission.vue'))
+})
 
 document.addEventListener('statamic:nocache.replaced', (e) => {
-    window.app.csrfToken = e?.detail?.csrf ?? window.app.csrfToken
+    const token = e?.detail?.csrf
+    if (token) {
+        if (window?.app?.config?.globalProperties) {
+            window.app.config.globalProperties.csrfToken = token
+        }
+    }
 })
\ No newline at end of file
diff --git a/src/Commands/InvalidateCacheCommand.php b/src/Commands/InvalidateCacheCommand.php
index 6885ffc..c7c086b 100644
--- a/src/Commands/InvalidateCacheCommand.php
+++ b/src/Commands/InvalidateCacheCommand.php
@@ -75,18 +75,18 @@ public function handle(Cacher $cacher, Writer $writer): void
 
     protected function addProductsUrls(): self
     {
-        $products = config('rapidez.models.product')::withoutGlobalScopes()
+        $products = config('rapidez.models.product')::query()
             ->where('updated_at', '>=', $this->latestCheck)
             ->orWhereIn('entity_id', $this->getUpdatedStockProducts())
-            ->with(['parent:entity_id' => ['rewrites']])
+            ->with(['parents:entity_id' => ['rewrites']])
             ->with('rewrites')
-            ->get('entity_id');
+            ->get();
 
         foreach ($products as $product) {
             $this->addUrls($this->getUrlsFromRewrites($product->rewrites));
 
-            if ($product->parent) {
-                $this->addUrls($this->getUrlsFromRewrites($product->parent->rewrites));
+            foreach ($product->parents as $parent) {
+                $this->addUrls($this->getUrlsFromRewrites($parent->rewrites));
             }
         }
 
diff --git a/src/Models/Product.php b/src/Models/Product.php
index 743d557..a7b4a81 100644
--- a/src/Models/Product.php
+++ b/src/Models/Product.php
@@ -4,22 +4,15 @@
 
 use Illuminate\Database\Eloquent\Attributes\ObservedBy;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-use Rapidez\Statamic\Collections\Products;
+use Rapidez\Core\Models\Product as CoreProduct;
 use Rapidez\Statamic\Models\Traits\HasContentEntry;
 use Rapidez\Statamic\Observers\RunwayObserver;
 use StatamicRadPack\Runway\Traits\HasRunwayResource;
-use Statamic\Facades\Site;
-use Statamic\Statamic;
-use Rapidez\Statamic\Facades\RapidezStatamic;
 
 #[ObservedBy([RunwayObserver::class])]
-class Product extends Model
+class Product extends CoreProduct
 {
     use HasRunwayResource, HasContentEntry;
-    
-    protected $primaryKey = 'sku';
-    protected $keyType = 'string';
 
     public string $linkField = 'linked_product';
     public string $collection = 'products';
@@ -27,12 +20,7 @@ class Product extends Model
     protected static function booting()
     {
         static::addGlobalScope(function (Builder $builder) {
-            $builder->whereIn('visibility', config('rapidez.statamic.runway.product_visibility'));
+            $builder->whereInAttribute('visibility', config('rapidez.statamic.runway.product_visibility'));
         });
     }
-
-    public function getTable()
-    {
-        return 'catalog_product_flat_' . RapidezStatamic::getCurrentStoreId();
-    }
 }
diff --git a/src/RapidezStatamicServiceProvider.php b/src/RapidezStatamicServiceProvider.php
index 967ced3..0beff24 100644
--- a/src/RapidezStatamicServiceProvider.php
+++ b/src/RapidezStatamicServiceProvider.php
@@ -184,9 +184,9 @@ public function bootRunway() : self
         }
 
         if (! Statamic::isCpRoute()) {
-            Blueprint::addNamespace('collections.brands', resource_path('blueprints/vendor/runway'));
-            Blueprint::addNamespace('collections.products', resource_path('blueprints/vendor/runway'));
-            Blueprint::addNamespace('collections.categories', resource_path('blueprints/vendor/runway'));
+            Blueprint::addNamespace('collections.brands', resource_path('blueprints/runway'));
+            Blueprint::addNamespace('collections.products', resource_path('blueprints/runway'));
+            Blueprint::addNamespace('collections.categories', resource_path('blueprints/runway'));
         }
 
         return $this;
@@ -233,7 +233,7 @@ public function bootPublishables() : self
         $this->publishes([
             __DIR__.'/../resources/content/assets' => base_path('content/assets'),
             __DIR__.'/../resources/fieldsets' => resource_path('fieldsets'),
-            __DIR__.'/../resources/blueprints/runway' => resource_path('blueprints/vendor/runway'),
+            __DIR__.'/../resources/blueprints/runway' => resource_path('blueprints/runway'),
         ], 'rapidez-statamic-content');
 
         $this->publishes([