diff --git a/src/servala/core/models/__init__.py b/src/servala/core/models/__init__.py
index 110d9d7..f637b57 100644
--- a/src/servala/core/models/__init__.py
+++ b/src/servala/core/models/__init__.py
@@ -6,18 +6,18 @@ from .organization import (
     OrganizationRole,
 )
 from .service import (
+    CloudProvider,
     ControlPlane,
     Plan,
     Service,
     ServiceCategory,
     ServiceOffering,
-    ServiceOfferingPlan,
-    ServiceProvider,
 )
 from .user import User
 
 __all__ = [
     "BillingEntity",
+    "CloudProvider",
     "ControlPlane",
     "Organization",
     "OrganizationMembership",
@@ -27,7 +27,5 @@ __all__ = [
     "Service",
     "ServiceCategory",
     "ServiceOffering",
-    "ServiceOfferingPlan",
-    "ServiceProvider",
     "User",
 ]
diff --git a/src/servala/core/models/organization.py b/src/servala/core/models/organization.py
index e7fb36a..d9fd27d 100644
--- a/src/servala/core/models/organization.py
+++ b/src/servala/core/models/organization.py
@@ -1,4 +1,3 @@
-from django.contrib.auth import get_user_model
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
@@ -20,7 +19,7 @@ class Organization(models.Model):
     )
 
     members = models.ManyToManyField(
-        to=get_user_model(),
+        to="core.User",
         through="OrganizationMembership",
         related_name="organizations",
         verbose_name=_("Members"),
@@ -70,7 +69,7 @@ class OrganizationMembership(models.Model):
     """Through-model for the many-to-many relationship between organizations and users."""
 
     user = models.ForeignKey(
-        to=get_user_model(),
+        to="core.User",
         on_delete=models.CASCADE,
         related_name="organization_memberships",
         verbose_name=_("User"),