diff --git a/end_to_end_tests/golden-record/my_test_api_client/models/__init__.py b/end_to_end_tests/golden-record/my_test_api_client/models/__init__.py
index 5bbd77d7d..ea210a41f 100644
--- a/end_to_end_tests/golden-record/my_test_api_client/models/__init__.py
+++ b/end_to_end_tests/golden-record/my_test_api_client/models/__init__.py
@@ -1,6 +1,7 @@
 """ Contains all the data models used in inputs/outputs """
 
 from .a_model import AModel
+from .a_model_with_properties_reference_that_are_not_object import AModelWithPropertiesReferenceThatAreNotObject
 from .all_of_sub_model import AllOfSubModel
 from .an_all_of_enum import AnAllOfEnum
 from .an_enum import AnEnum
diff --git a/end_to_end_tests/golden-record/my_test_api_client/models/a_model_with_properties_reference_that_are_not_object.py b/end_to_end_tests/golden-record/my_test_api_client/models/a_model_with_properties_reference_that_are_not_object.py
new file mode 100644
index 000000000..797b57b38
--- /dev/null
+++ b/end_to_end_tests/golden-record/my_test_api_client/models/a_model_with_properties_reference_that_are_not_object.py
@@ -0,0 +1,341 @@
+import datetime
+from io import BytesIO
+from typing import Any, Dict, List, Type, TypeVar, cast
+
+import attr
+from dateutil.parser import isoparse
+
+from ..models.an_enum import AnEnum
+from ..types import File
+
+T = TypeVar("T", bound="AModelWithPropertiesReferenceThatAreNotObject")
+
+
+@attr.s(auto_attribs=True)
+class AModelWithPropertiesReferenceThatAreNotObject:
+    """ """
+
+    enum_properties_ref: List[AnEnum]
+    str_properties_ref: List[str]
+    date_properties_ref: List[datetime.date]
+    datetime_properties_ref: List[datetime.datetime]
+    int_32_properties_ref: List[int]
+    int_64_properties_ref: List[int]
+    float_properties_ref: List[float]
+    double_properties_ref: List[float]
+    file_properties_ref: List[File]
+    bytestream_properties_ref: List[str]
+    enum_properties: List[AnEnum]
+    str_properties: List[str]
+    date_properties: List[datetime.date]
+    datetime_properties: List[datetime.datetime]
+    int_32_properties: List[int]
+    int_64_properties: List[int]
+    float_properties: List[float]
+    double_properties: List[float]
+    file_properties: List[File]
+    bytestream_properties: List[str]
+    enum_property_ref: AnEnum
+    str_property_ref: str
+    date_property_ref: datetime.date
+    datetime_property_ref: datetime.datetime
+    int_32_property_ref: int
+    int_64_property_ref: int
+    float_property_ref: float
+    double_property_ref: float
+    file_property_ref: File
+    bytestream_property_ref: str
+    additional_properties: Dict[str, Any] = attr.ib(init=False, factory=dict)
+
+    def to_dict(self) -> Dict[str, Any]:
+        enum_properties_ref = []
+        for componentsschemas_an_other_array_of_enum_item_data in self.enum_properties_ref:
+            componentsschemas_an_other_array_of_enum_item = componentsschemas_an_other_array_of_enum_item_data.value
+
+            enum_properties_ref.append(componentsschemas_an_other_array_of_enum_item)
+
+        str_properties_ref = self.str_properties_ref
+
+        date_properties_ref = []
+        for componentsschemas_an_other_array_of_date_item_data in self.date_properties_ref:
+            componentsschemas_an_other_array_of_date_item = (
+                componentsschemas_an_other_array_of_date_item_data.isoformat()
+            )
+            date_properties_ref.append(componentsschemas_an_other_array_of_date_item)
+
+        datetime_properties_ref = []
+        for componentsschemas_an_other_array_of_date_time_item_data in self.datetime_properties_ref:
+            componentsschemas_an_other_array_of_date_time_item = (
+                componentsschemas_an_other_array_of_date_time_item_data.isoformat()
+            )
+
+            datetime_properties_ref.append(componentsschemas_an_other_array_of_date_time_item)
+
+        int_32_properties_ref = self.int_32_properties_ref
+
+        int_64_properties_ref = self.int_64_properties_ref
+
+        float_properties_ref = self.float_properties_ref
+
+        double_properties_ref = self.double_properties_ref
+
+        file_properties_ref = []
+        for componentsschemas_an_other_array_of_file_item_data in self.file_properties_ref:
+            componentsschemas_an_other_array_of_file_item = (
+                componentsschemas_an_other_array_of_file_item_data.to_tuple()
+            )
+
+            file_properties_ref.append(componentsschemas_an_other_array_of_file_item)
+
+        bytestream_properties_ref = self.bytestream_properties_ref
+
+        enum_properties = []
+        for componentsschemas_an_array_of_enum_item_data in self.enum_properties:
+            componentsschemas_an_array_of_enum_item = componentsschemas_an_array_of_enum_item_data.value
+
+            enum_properties.append(componentsschemas_an_array_of_enum_item)
+
+        str_properties = self.str_properties
+
+        date_properties = []
+        for componentsschemas_an_array_of_date_item_data in self.date_properties:
+            componentsschemas_an_array_of_date_item = componentsschemas_an_array_of_date_item_data.isoformat()
+            date_properties.append(componentsschemas_an_array_of_date_item)
+
+        datetime_properties = []
+        for componentsschemas_an_array_of_date_time_item_data in self.datetime_properties:
+            componentsschemas_an_array_of_date_time_item = componentsschemas_an_array_of_date_time_item_data.isoformat()
+
+            datetime_properties.append(componentsschemas_an_array_of_date_time_item)
+
+        int_32_properties = self.int_32_properties
+
+        int_64_properties = self.int_64_properties
+
+        float_properties = self.float_properties
+
+        double_properties = self.double_properties
+
+        file_properties = []
+        for componentsschemas_an_array_of_file_item_data in self.file_properties:
+            componentsschemas_an_array_of_file_item = componentsschemas_an_array_of_file_item_data.to_tuple()
+
+            file_properties.append(componentsschemas_an_array_of_file_item)
+
+        bytestream_properties = self.bytestream_properties
+
+        enum_property_ref = self.enum_property_ref.value
+
+        str_property_ref = self.str_property_ref
+        date_property_ref = self.date_property_ref.isoformat()
+        datetime_property_ref = self.datetime_property_ref.isoformat()
+
+        int_32_property_ref = self.int_32_property_ref
+        int_64_property_ref = self.int_64_property_ref
+        float_property_ref = self.float_property_ref
+        double_property_ref = self.double_property_ref
+        file_property_ref = self.file_property_ref.to_tuple()
+
+        bytestream_property_ref = self.bytestream_property_ref
+
+        field_dict: Dict[str, Any] = {}
+        field_dict.update(self.additional_properties)
+        field_dict.update(
+            {
+                "enum_properties_ref": enum_properties_ref,
+                "str_properties_ref": str_properties_ref,
+                "date_properties_ref": date_properties_ref,
+                "datetime_properties_ref": datetime_properties_ref,
+                "int32_properties_ref": int_32_properties_ref,
+                "int64_properties_ref": int_64_properties_ref,
+                "float_properties_ref": float_properties_ref,
+                "double_properties_ref": double_properties_ref,
+                "file_properties_ref": file_properties_ref,
+                "bytestream_properties_ref": bytestream_properties_ref,
+                "enum_properties": enum_properties,
+                "str_properties": str_properties,
+                "date_properties": date_properties,
+                "datetime_properties": datetime_properties,
+                "int32_properties": int_32_properties,
+                "int64_properties": int_64_properties,
+                "float_properties": float_properties,
+                "double_properties": double_properties,
+                "file_properties": file_properties,
+                "bytestream_properties": bytestream_properties,
+                "enum_property_ref": enum_property_ref,
+                "str_property_ref": str_property_ref,
+                "date_property_ref": date_property_ref,
+                "datetime_property_ref": datetime_property_ref,
+                "int32_property_ref": int_32_property_ref,
+                "int64_property_ref": int_64_property_ref,
+                "float_property_ref": float_property_ref,
+                "double_property_ref": double_property_ref,
+                "file_property_ref": file_property_ref,
+                "bytestream_property_ref": bytestream_property_ref,
+            }
+        )
+
+        return field_dict
+
+    @classmethod
+    def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
+        d = src_dict.copy()
+        enum_properties_ref = []
+        _enum_properties_ref = d.pop("enum_properties_ref")
+        for componentsschemas_an_other_array_of_enum_item_data in _enum_properties_ref:
+            componentsschemas_an_other_array_of_enum_item = AnEnum(componentsschemas_an_other_array_of_enum_item_data)
+
+            enum_properties_ref.append(componentsschemas_an_other_array_of_enum_item)
+
+        str_properties_ref = cast(List[str], d.pop("str_properties_ref"))
+
+        date_properties_ref = []
+        _date_properties_ref = d.pop("date_properties_ref")
+        for componentsschemas_an_other_array_of_date_item_data in _date_properties_ref:
+            componentsschemas_an_other_array_of_date_item = isoparse(
+                componentsschemas_an_other_array_of_date_item_data
+            ).date()
+
+            date_properties_ref.append(componentsschemas_an_other_array_of_date_item)
+
+        datetime_properties_ref = []
+        _datetime_properties_ref = d.pop("datetime_properties_ref")
+        for componentsschemas_an_other_array_of_date_time_item_data in _datetime_properties_ref:
+            componentsschemas_an_other_array_of_date_time_item = isoparse(
+                componentsschemas_an_other_array_of_date_time_item_data
+            )
+
+            datetime_properties_ref.append(componentsschemas_an_other_array_of_date_time_item)
+
+        int_32_properties_ref = cast(List[int], d.pop("int32_properties_ref"))
+
+        int_64_properties_ref = cast(List[int], d.pop("int64_properties_ref"))
+
+        float_properties_ref = cast(List[float], d.pop("float_properties_ref"))
+
+        double_properties_ref = cast(List[float], d.pop("double_properties_ref"))
+
+        file_properties_ref = []
+        _file_properties_ref = d.pop("file_properties_ref")
+        for componentsschemas_an_other_array_of_file_item_data in _file_properties_ref:
+            componentsschemas_an_other_array_of_file_item = File(
+                payload=BytesIO(componentsschemas_an_other_array_of_file_item_data)
+            )
+
+            file_properties_ref.append(componentsschemas_an_other_array_of_file_item)
+
+        bytestream_properties_ref = cast(List[str], d.pop("bytestream_properties_ref"))
+
+        enum_properties = []
+        _enum_properties = d.pop("enum_properties")
+        for componentsschemas_an_array_of_enum_item_data in _enum_properties:
+            componentsschemas_an_array_of_enum_item = AnEnum(componentsschemas_an_array_of_enum_item_data)
+
+            enum_properties.append(componentsschemas_an_array_of_enum_item)
+
+        str_properties = cast(List[str], d.pop("str_properties"))
+
+        date_properties = []
+        _date_properties = d.pop("date_properties")
+        for componentsschemas_an_array_of_date_item_data in _date_properties:
+            componentsschemas_an_array_of_date_item = isoparse(componentsschemas_an_array_of_date_item_data).date()
+
+            date_properties.append(componentsschemas_an_array_of_date_item)
+
+        datetime_properties = []
+        _datetime_properties = d.pop("datetime_properties")
+        for componentsschemas_an_array_of_date_time_item_data in _datetime_properties:
+            componentsschemas_an_array_of_date_time_item = isoparse(componentsschemas_an_array_of_date_time_item_data)
+
+            datetime_properties.append(componentsschemas_an_array_of_date_time_item)
+
+        int_32_properties = cast(List[int], d.pop("int32_properties"))
+
+        int_64_properties = cast(List[int], d.pop("int64_properties"))
+
+        float_properties = cast(List[float], d.pop("float_properties"))
+
+        double_properties = cast(List[float], d.pop("double_properties"))
+
+        file_properties = []
+        _file_properties = d.pop("file_properties")
+        for componentsschemas_an_array_of_file_item_data in _file_properties:
+            componentsschemas_an_array_of_file_item = File(
+                payload=BytesIO(componentsschemas_an_array_of_file_item_data)
+            )
+
+            file_properties.append(componentsschemas_an_array_of_file_item)
+
+        bytestream_properties = cast(List[str], d.pop("bytestream_properties"))
+
+        enum_property_ref = AnEnum(d.pop("enum_property_ref"))
+
+        str_property_ref = d.pop("str_property_ref")
+
+        date_property_ref = isoparse(d.pop("date_property_ref")).date()
+
+        datetime_property_ref = isoparse(d.pop("datetime_property_ref"))
+
+        int_32_property_ref = d.pop("int32_property_ref")
+
+        int_64_property_ref = d.pop("int64_property_ref")
+
+        float_property_ref = d.pop("float_property_ref")
+
+        double_property_ref = d.pop("double_property_ref")
+
+        file_property_ref = File(payload=BytesIO(d.pop("file_property_ref")))
+
+        bytestream_property_ref = d.pop("bytestream_property_ref")
+
+        a_model_with_properties_reference_that_are_not_object = cls(
+            enum_properties_ref=enum_properties_ref,
+            str_properties_ref=str_properties_ref,
+            date_properties_ref=date_properties_ref,
+            datetime_properties_ref=datetime_properties_ref,
+            int_32_properties_ref=int_32_properties_ref,
+            int_64_properties_ref=int_64_properties_ref,
+            float_properties_ref=float_properties_ref,
+            double_properties_ref=double_properties_ref,
+            file_properties_ref=file_properties_ref,
+            bytestream_properties_ref=bytestream_properties_ref,
+            enum_properties=enum_properties,
+            str_properties=str_properties,
+            date_properties=date_properties,
+            datetime_properties=datetime_properties,
+            int_32_properties=int_32_properties,
+            int_64_properties=int_64_properties,
+            float_properties=float_properties,
+            double_properties=double_properties,
+            file_properties=file_properties,
+            bytestream_properties=bytestream_properties,
+            enum_property_ref=enum_property_ref,
+            str_property_ref=str_property_ref,
+            date_property_ref=date_property_ref,
+            datetime_property_ref=datetime_property_ref,
+            int_32_property_ref=int_32_property_ref,
+            int_64_property_ref=int_64_property_ref,
+            float_property_ref=float_property_ref,
+            double_property_ref=double_property_ref,
+            file_property_ref=file_property_ref,
+            bytestream_property_ref=bytestream_property_ref,
+        )
+
+        a_model_with_properties_reference_that_are_not_object.additional_properties = d
+        return a_model_with_properties_reference_that_are_not_object
+
+    @property
+    def additional_keys(self) -> List[str]:
+        return list(self.additional_properties.keys())
+
+    def __getitem__(self, key: str) -> Any:
+        return self.additional_properties[key]
+
+    def __setitem__(self, key: str, value: Any) -> None:
+        self.additional_properties[key] = value
+
+    def __delitem__(self, key: str) -> None:
+        del self.additional_properties[key]
+
+    def __contains__(self, key: str) -> bool:
+        return key in self.additional_properties
diff --git a/end_to_end_tests/openapi.json b/end_to_end_tests/openapi.json
index 585b97cde..64ccfdbc9 100644
--- a/end_to_end_tests/openapi.json
+++ b/end_to_end_tests/openapi.json
@@ -752,19 +752,25 @@
       ],
       "get": {
         "responses": {
-          "200": {"description": "Success"}
+          "200": {
+            "description": "Success"
+          }
         }
       },
       "post": {
         "responses": {
-          "200": {"description": "Success"}
+          "200": {
+            "description": "Success"
+          }
         }
       }
     },
     "/same-name-multiple-locations/{param}": {
       "description": "Test that if you have a property of the same name in multiple locations, it produces valid code",
       "get": {
-        "tags": ["parameters"],
+        "tags": [
+          "parameters"
+        ],
         "parameters": [
           {
             "name": "param",
@@ -893,10 +899,10 @@
           "one_of_models": {
             "oneOf": [
               {
-                "ref": "#/components/schemas/FreeFormModel"
+                "$ref": "#/components/schemas/FreeFormModel"
               },
               {
-                "ref": "#/components/schemas/ModelWithUnionProperty"
+                "$ref": "#/components/schemas/ModelWithUnionProperty"
               }
             ],
             "nullable": false
@@ -904,10 +910,10 @@
           "nullable_one_of_models": {
             "oneOf": [
               {
-                "ref": "#/components/schemas/FreeFormModel"
+                "$ref": "#/components/schemas/FreeFormModel"
               },
               {
-                "ref": "#/components/schemas/ModelWithUnionProperty"
+                "$ref": "#/components/schemas/ModelWithUnionProperty"
               }
             ],
             "nullable": true
@@ -915,10 +921,10 @@
           "not_required_one_of_models": {
             "oneOf": [
               {
-                "ref": "#/components/schemas/FreeFormModel"
+                "$ref": "#/components/schemas/FreeFormModel"
               },
               {
-                "ref": "#/components/schemas/ModelWithUnionProperty"
+                "$ref": "#/components/schemas/ModelWithUnionProperty"
               }
             ],
             "nullable": false
@@ -926,10 +932,10 @@
           "not_required_nullable_one_of_models": {
             "oneOf": [
               {
-                "ref": "#/components/schemas/FreeFormModel"
+                "$ref": "#/components/schemas/FreeFormModel"
               },
               {
-                "ref": "#/components/schemas/ModelWithUnionProperty"
+                "$ref": "#/components/schemas/ModelWithUnionProperty"
               },
               {
                 "type": "string"
@@ -940,7 +946,7 @@
           "model": {
             "allOf": [
               {
-                "ref": "#/components/schemas/ModelWithUnionProperty"
+                "$ref": "#/components/schemas/ModelWithUnionProperty"
               }
             ],
             "nullable": false
@@ -948,7 +954,7 @@
           "nullable_model": {
             "allOf": [
               {
-                "ref": "#/components/schemas/ModelWithUnionProperty"
+                "$ref": "#/components/schemas/ModelWithUnionProperty"
               }
             ],
             "nullable": true
@@ -956,7 +962,7 @@
           "not_required_model": {
             "allOf": [
               {
-                "ref": "#/components/schemas/ModelWithUnionProperty"
+                "$ref": "#/components/schemas/ModelWithUnionProperty"
               }
             ],
             "nullable": false
@@ -964,7 +970,7 @@
           "not_required_nullable_model": {
             "allOf": [
               {
-                "ref": "#/components/schemas/ModelWithUnionProperty"
+                "$ref": "#/components/schemas/ModelWithUnionProperty"
               }
             ],
             "nullable": true
@@ -975,23 +981,37 @@
       },
       "AnEnum": {
         "title": "AnEnum",
-        "enum": ["FIRST_VALUE", "SECOND_VALUE"],
+        "enum": [
+          "FIRST_VALUE",
+          "SECOND_VALUE"
+        ],
         "description": "For testing Enums in all the ways they can be used "
       },
       "AnAllOfEnum": {
         "title": "AnAllOfEnum",
-        "enum": ["foo", "bar", "a_default", "overridden_default"],
+        "enum": [
+          "foo",
+          "bar",
+          "a_default",
+          "overridden_default"
+        ],
         "default": "a_default"
       },
       "AnIntEnum": {
         "title": "AnIntEnum",
-        "enum": [-1, 1, 2],
+        "enum": [
+          -1,
+          1,
+          2
+        ],
         "type": "integer",
         "description": "An enumeration."
       },
       "Body_upload_file_tests_upload_post": {
         "title": "Body_upload_file_tests_upload_post",
-        "required": ["some_file"],
+        "required": [
+          "some_file"
+        ],
         "type": "object",
         "properties": {
           "some_file": {
@@ -1009,7 +1029,10 @@
       },
       "DifferentEnum": {
         "title": "DifferentEnum",
-        "enum": ["DIFFERENT", "OTHER"],
+        "enum": [
+          "DIFFERENT",
+          "OTHER"
+        ],
         "description": "An enumeration."
       },
       "HTTPValidationError": {
@@ -1028,7 +1051,11 @@
       },
       "ValidationError": {
         "title": "ValidationError",
-        "required": ["loc", "msg", "type"],
+        "required": [
+          "loc",
+          "msg",
+          "type"
+        ],
         "type": "object",
         "properties": {
           "loc": {
@@ -1055,8 +1082,12 @@
         "properties": {
           "a_property": {
             "oneOf": [
-              {"$ref": "#/components/schemas/AnEnum"},
-              {"$ref": "#/components/schemas/AnIntEnum"}
+              {
+                "$ref": "#/components/schemas/AnEnum"
+              },
+              {
+                "$ref": "#/components/schemas/AnIntEnum"
+              }
             ]
           }
         },
@@ -1071,13 +1102,17 @@
               {
                 "type": "object",
                 "properties": {
-                  "apples": {"type": "string"}
+                  "apples": {
+                    "type": "string"
+                  }
                 }
               },
               {
                 "type": "object",
                 "properties": {
-                  "bananas": {"type": "string"}
+                  "bananas": {
+                    "type": "string"
+                  }
                 }
               }
             ]
@@ -1099,7 +1134,9 @@
         "additionalProperties": {
           "type": "object",
           "properties": {
-            "extra_props_prop": {"type": "string"}
+            "extra_props_prop": {
+              "type": "string"
+            }
           },
           "additionalProperties": {}
         }
@@ -1163,8 +1200,12 @@
         "title": "ModelFromAllOf",
         "type": "object",
         "allOf": [
-          {"$ref": "#/components/schemas/AllOfSubModel"},
-          {"$ref": "#/components/schemas/AnotherAllOfSubModel"}
+          {
+            "$ref": "#/components/schemas/AllOfSubModel"
+          },
+          {
+            "$ref": "#/components/schemas/AnotherAllOfSubModel"
+          }
         ]
       },
       "AllOfSubModel": {
@@ -1192,8 +1233,306 @@
       "ModelWithPropertyRef": {
         "type": "object",
         "properties": {
-          "inner": {"$ref":  "#/components/schemas/model_reference_doesnt_match"}
+          "inner": {
+            "$ref": "#/components/schemas/model_reference_doesnt_match"
+          }
+        }
+      },
+      "AModelWithPropertiesReferenceThatAreNotObject": {
+        "type": "object",
+        "required": [
+          "enum_properties_ref",
+          "str_properties_ref",
+          "date_properties_ref",
+          "datetime_properties_ref",
+          "int32_properties_ref",
+          "int64_properties_ref",
+          "float_properties_ref",
+          "double_properties_ref",
+          "file_properties_ref",
+          "bytestream_properties_ref",
+          "enum_properties",
+          "str_properties",
+          "date_properties",
+          "datetime_properties",
+          "int32_properties",
+          "int64_properties",
+          "float_properties",
+          "double_properties",
+          "file_properties",
+          "bytestream_properties",
+          "enum_property_ref",
+          "str_property_ref",
+          "date_property_ref",
+          "datetime_property_ref",
+          "int32_property_ref",
+          "int64_property_ref",
+          "float_property_ref",
+          "double_property_ref",
+          "file_property_ref",
+          "bytestream_property_ref"
+        ],
+        "properties": {
+          "enum_properties_ref": {
+            "$ref": "#/components/schemas/AnOtherArrayOfEnum"
+          },
+          "str_properties_ref": {
+            "$ref": "#/components/schemas/AnOtherArrayOfString"
+          },
+          "date_properties_ref": {
+            "$ref": "#/components/schemas/AnOtherArrayOfDate"
+          },
+          "datetime_properties_ref": {
+            "$ref": "#/components/schemas/AnOtherArrayOfDateTime"
+          },
+          "int32_properties_ref": {
+            "$ref": "#/components/schemas/AnOtherArrayOfInt32"
+          },
+          "int64_properties_ref": {
+            "$ref": "#/components/schemas/AnOtherArrayOfInt64"
+          },
+          "float_properties_ref": {
+            "$ref": "#/components/schemas/AnOtherArrayOfFloat"
+          },
+          "double_properties_ref": {
+            "$ref": "#/components/schemas/AnOtherArrayOfDouble"
+          },
+          "file_properties_ref": {
+            "$ref": "#/components/schemas/AnOtherArrayOfFile"
+          },
+          "bytestream_properties_ref": {
+            "$ref": "#/components/schemas/AnOtherArrayOfByteStream"
+          },
+          "enum_properties": {
+            "$ref": "#/components/schemas/AnArrayOfEnum"
+          },
+          "str_properties": {
+            "$ref": "#/components/schemas/AnArrayOfString"
+          },
+          "date_properties": {
+            "$ref": "#/components/schemas/AnArrayOfDate"
+          },
+          "datetime_properties": {
+            "$ref": "#/components/schemas/AnArrayOfDateTime"
+          },
+          "int32_properties": {
+            "$ref": "#/components/schemas/AnArrayOfInt32"
+          },
+          "int64_properties": {
+            "$ref": "#/components/schemas/AnArrayOfInt64"
+          },
+          "float_properties": {
+            "$ref": "#/components/schemas/AnArrayOfFloat"
+          },
+          "double_properties": {
+            "$ref": "#/components/schemas/AnArrayOfDouble"
+          },
+          "file_properties": {
+            "$ref": "#/components/schemas/AnArrayOfFile"
+          },
+          "bytestream_properties": {
+            "$ref": "#/components/schemas/AnArrayOfByteStream"
+          },
+          "enum_property_ref": {
+            "$ref": "#/components/schemas/AnEnum"
+          },
+          "str_property_ref": {
+            "$ref": "#/components/schemas/AString"
+          },
+          "date_property_ref": {
+            "$ref": "#/components/schemas/ADate"
+          },
+          "datetime_property_ref": {
+            "$ref": "#/components/schemas/ADateTime"
+          },
+          "int32_property_ref": {
+            "$ref": "#/components/schemas/AnInt32"
+          },
+          "int64_property_ref": {
+            "$ref": "#/components/schemas/AnInt64"
+          },
+          "float_property_ref": {
+            "$ref": "#/components/schemas/AFloat"
+          },
+          "double_property_ref": {
+            "$ref": "#/components/schemas/ADouble"
+          },
+          "file_property_ref": {
+            "$ref": "#/components/schemas/AFile"
+          },
+          "bytestream_property_ref": {
+            "$ref": "#/components/schemas/AByteStream"
+          }
+        }
+      },
+      "AnArrayOfEnum": {
+        "type": "array",
+        "items": {
+          "title": "AnEnum",
+          "enum": [
+            "FIRST_VALUE",
+            "SECOND_VALUE"
+          ],
+          "description": "For testing Enums in all the ways they can be used "
+        }
+      },
+      "AnOtherArrayOfEnum": {
+        "type": "array",
+        "items": {
+          "$ref": "#/components/schemas/AnEnum"
+        }
+      },
+      "AnArrayOfString": {
+        "type": "array",
+        "items": {
+          "type": "string"
+        }
+      },
+      "AnOtherArrayOfString": {
+        "type": "array",
+        "items": {
+          "$ref": "#/components/schemas/AString"
+        }
+      },
+      "AString": {
+        "type": "string",
+        "pattern": "^helloworld.*"
+      },
+      "AnArrayOfDate": {
+        "type": "array",
+        "items": {
+          "type": "string",
+          "format": "date"
+        }
+      },
+      "AnOtherArrayOfDate": {
+        "type": "array",
+        "items": {
+          "$ref": "#/components/schemas/ADate"
+        }
+      },
+      "ADate": {
+        "type": "string",
+        "format": "date"
+      },
+      "AnArrayOfDateTime": {
+        "type": "array",
+        "items": {
+          "type": "string",
+          "format": "date-time"
+        }
+      },
+      "AnOtherArrayOfDateTime": {
+        "type": "array",
+        "items": {
+          "$ref": "#/components/schemas/ADateTime"
+        }
+      },
+      "ADateTime": {
+        "type": "string",
+        "format": "date-time"
+      },
+      "AnArrayOfInt32": {
+        "type": "array",
+        "items": {
+          "type": "integer",
+          "format": "int32"
         }
+      },
+      "AnOtherArrayOfInt32": {
+        "type": "array",
+        "items": {
+          "$ref": "#/components/schemas/AnInt32"
+        }
+      },
+      "AnInt32": {
+        "type": "integer",
+        "format": "int32"
+      },
+      "AnArrayOfInt64": {
+        "type": "array",
+        "items": {
+          "type": "integer",
+          "format": "int64"
+        }
+      },
+      "AnOtherArrayOfInt64": {
+        "type": "array",
+        "items": {
+          "$ref": "#/components/schemas/AnInt64"
+        }
+      },
+      "AnInt64": {
+        "type": "integer",
+        "format": "int64"
+      },
+      "AnArrayOfFloat": {
+        "type": "array",
+        "items": {
+          "type": "number",
+          "format": "float"
+        }
+      },
+      "AnOtherArrayOfFloat": {
+        "type": "array",
+        "items": {
+          "$ref": "#/components/schemas/AFloat"
+        }
+      },
+      "AFloat": {
+        "type": "number",
+        "format": "float"
+      },
+      "AnArrayOfDouble": {
+        "type": "array",
+        "items": {
+          "type": "number",
+          "format": "float"
+        }
+      },
+      "AnOtherArrayOfDouble": {
+        "type": "array",
+        "items": {
+          "$ref": "#/components/schemas/ADouble"
+        }
+      },
+      "ADouble": {
+        "type": "number",
+        "format": "double"
+      },
+      "AnArrayOfFile": {
+        "type": "array",
+        "items": {
+          "type": "string",
+          "format": "binary"
+        }
+      },
+      "AnOtherArrayOfFile": {
+        "type": "array",
+        "items": {
+          "$ref": "#/components/schemas/AFile"
+        }
+      },
+      "AFile": {
+        "type": "string",
+        "format": "binary"
+      },
+      "AnArrayOfByteStream": {
+        "type": "array",
+        "items": {
+          "type": "string",
+          "format": "byte"
+        }
+      },
+      "AnOtherArrayOfByteStream": {
+        "type": "array",
+        "items": {
+          "$ref": "#/components/schemas/AByteStream"
+        }
+      },
+      "AByteStream": {
+        "type": "string",
+        "format": "byte"
       }
     }
   }
diff --git a/openapi_python_client/parser/properties/schemas.py b/openapi_python_client/parser/properties/schemas.py
index a81879dfc..71ecf3843 100644
--- a/openapi_python_client/parser/properties/schemas.py
+++ b/openapi_python_client/parser/properties/schemas.py
@@ -11,11 +11,9 @@
 from ..errors import ParseError, PropertyError
 
 if TYPE_CHECKING:  # pragma: no cover
-    from .enum_property import EnumProperty
-    from .model_property import ModelProperty
+    from .property import Property
 else:
-    EnumProperty = "EnumProperty"
-    ModelProperty = "ModelProperty"
+    Property = "Property"
 
 
 _ReferencePath = NewType("_ReferencePath", str)
@@ -58,26 +56,23 @@ def from_string(*, string: str, config: Config) -> "Class":
 class Schemas:
     """Structure for containing all defined, shareable, and reusable schemas (attr classes and Enums)"""
 
-    classes_by_reference: Dict[_ReferencePath, Union[EnumProperty, ModelProperty]] = attr.ib(factory=dict)
-    classes_by_name: Dict[_ClassName, Union[EnumProperty, ModelProperty]] = attr.ib(factory=dict)
+    classes_by_reference: Dict[_ReferencePath, Property] = attr.ib(factory=dict)
+    classes_by_name: Dict[_ClassName, Property] = attr.ib(factory=dict)
     errors: List[ParseError] = attr.ib(factory=list)
 
 
 def update_schemas_with_data(
     *, ref_path: _ReferencePath, data: oai.Schema, schemas: Schemas, config: Config
 ) -> Union[Schemas, PropertyError]:
-    from . import build_enum_property, build_model_property
-
-    prop: Union[PropertyError, ModelProperty, EnumProperty]
-    if data.enum is not None:
-        prop, schemas = build_enum_property(
-            data=data, name=ref_path, required=True, schemas=schemas, enum=data.enum, parent_name=None, config=config
-        )
-    else:
-        prop, schemas = build_model_property(
-            data=data, name=ref_path, schemas=schemas, required=True, parent_name=None, config=config
-        )
+    from . import property_from_data
+
+    prop: Union[PropertyError, Property]
+    prop, schemas = property_from_data(
+        data=data, name=ref_path, schemas=schemas, required=True, parent_name="", config=config
+    )
+
     if isinstance(prop, PropertyError):
         return prop
+
     schemas = attr.evolve(schemas, classes_by_reference={ref_path: prop, **schemas.classes_by_reference})
     return schemas
diff --git a/openapi_python_client/templates/model.py.jinja b/openapi_python_client/templates/model.py.jinja
index 8541db32d..0cc98b105 100644
--- a/openapi_python_client/templates/model.py.jinja
+++ b/openapi_python_client/templates/model.py.jinja
@@ -1,4 +1,4 @@
-from typing import Any, Dict, Type, TypeVar
+from typing import Any, Dict, Type, TypeVar, Tuple, Optional, BinaryIO, TextIO
 
 {% if model.additional_properties %}
 from typing import List