diff --git a/.fernignore b/.fernignore
index 75d1cd07..f63ee657 100644
--- a/.fernignore
+++ b/.fernignore
@@ -1,4 +1,10 @@
 lib/square_legacy/
 lib/square_legacy.rb
 Gemfile
-Rakefile
\ No newline at end of file
+Rakefile
+
+lib/square/types/catalog_object_category.rb
+lib/square/types/catalog_object_subscription_plan.rb
+lib/square/types/catalog_object_item_option.rb
+lib/square/types/catalog_object_modifier_list.rb
+lib/square/types/catalog_object_item.rb
diff --git a/lib/square/types/catalog_object_category.rb b/lib/square/types/catalog_object_category.rb
index 11326a5c..53ac61e9 100644
--- a/lib/square/types/catalog_object_category.rb
+++ b/lib/square/types/catalog_object_category.rb
@@ -6,6 +6,12 @@ module Types
     # to another category. For example, a clothing category can be assigned to a t-shirt item or 
     # be made as the parent category to the pants category.
     class CatalogObjectCategory < Internal::Types::Model
+
+      # Manual Forward Declarations
+      class Square::Types::CatalogCategory < Internal::Types::Model; end
+      class Square::Types::CatalogCustomAttributeValue < Internal::Types::Model; end
+      class Square::Types::CatalogV1Id < Internal::Types::Model; end
+
       field :id, String, optional: true, nullable: false
       field :ordinal, Integer, optional: true, nullable: false
       field :type, String, optional: false, nullable: false
diff --git a/lib/square/types/catalog_object_item.rb b/lib/square/types/catalog_object_item.rb
index 74746be6..9f514492 100644
--- a/lib/square/types/catalog_object_item.rb
+++ b/lib/square/types/catalog_object_item.rb
@@ -3,6 +3,12 @@
 module Square
   module Types
     class CatalogObjectItem < Internal::Types::Model
+
+      # Manual Forward Declarations
+      class Square::Types::CatalogItem < Internal::Types::Model; end
+      class Square::Types::CatalogCustomAttributeValue < Internal::Types::Model; end
+      class Square::Types::CatalogV1Id < Internal::Types::Model; end
+
       field :type, String, optional: false, nullable: false
       field :item_data, Square::Types::CatalogItem, optional: true, nullable: false
       field :id, String, optional: false, nullable: false
diff --git a/lib/square/types/catalog_object_item_option.rb b/lib/square/types/catalog_object_item_option.rb
index 271df701..f8da7033 100644
--- a/lib/square/types/catalog_object_item_option.rb
+++ b/lib/square/types/catalog_object_item_option.rb
@@ -3,6 +3,12 @@
 module Square
   module Types
     class CatalogObjectItemOption < Internal::Types::Model
+
+      # Manual Forward Declarations
+      class Square::Types::CatalogItemOption < Internal::Types::Model; end
+      class Square::Types::CatalogCustomAttributeValue < Internal::Types::Model; end
+      class Square::Types::CatalogV1Id < Internal::Types::Model; end
+
       field :type, String, optional: false, nullable: false
       field :item_option_data, Square::Types::CatalogItemOption, optional: true, nullable: false
       field :id, String, optional: false, nullable: false
diff --git a/lib/square/types/catalog_object_modifier_list.rb b/lib/square/types/catalog_object_modifier_list.rb
index 9da9c04d..2459e0dd 100644
--- a/lib/square/types/catalog_object_modifier_list.rb
+++ b/lib/square/types/catalog_object_modifier_list.rb
@@ -3,6 +3,12 @@
 module Square
   module Types
     class CatalogObjectModifierList < Internal::Types::Model
+
+      # Manual Forward Declarations
+      class Square::Types::CatalogModifierList < Internal::Types::Model; end
+      class Square::Types::CatalogCustomAttributeValue < Internal::Types::Model; end
+      class Square::Types::CatalogV1Id < Internal::Types::Model; end
+
       field :type, String, optional: false, nullable: false
       field :modifier_list_data, Square::Types::CatalogModifierList, optional: true, nullable: false
       field :id, String, optional: false, nullable: false
diff --git a/lib/square/types/catalog_object_subscription_plan.rb b/lib/square/types/catalog_object_subscription_plan.rb
index ade12b8f..dbaf95a0 100644
--- a/lib/square/types/catalog_object_subscription_plan.rb
+++ b/lib/square/types/catalog_object_subscription_plan.rb
@@ -3,6 +3,12 @@
 module Square
   module Types
     class CatalogObjectSubscriptionPlan < Internal::Types::Model
+
+      # Manual Forward Declarations
+      class Square::Types::CatalogSubscriptionPlan < Internal::Types::Model; end
+      class Square::Types::CatalogCustomAttributeValue < Internal::Types::Model; end
+      class Square::Types::CatalogV1Id < Internal::Types::Model; end
+
       field :type, String, optional: false, nullable: false
       field :subscription_plan_data, Square::Types::CatalogSubscriptionPlan, optional: true, nullable: false
       field :id, String, optional: false, nullable: false