diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES
index 470df39..43015bb 100644
--- a/.openapi-generator/FILES
+++ b/.openapi-generator/FILES
@@ -216,103 +216,4 @@ setup.cfg
 setup.py
 test-requirements.txt
 test/__init__.py
-test/test_analyses_api.py
-test/test_analysis_base.py
-test/test_analysis_common.py
-test/test_analysis_list.py
-test/test_analysis_request.py
-test/test_analysis_request_relationships.py
-test/test_analysis_request_relationships_conditions.py
-test/test_analysis_request_relationships_images.py
-test/test_analysis_request_relationships_points.py
-test/test_analysis_return.py
-test/test_analysis_return_relationships.py
-test/test_analysis_return_relationships_conditions.py
-test/test_analysis_return_relationships_images.py
-test/test_analysis_return_relationships_points.py
-test/test_annotation_base.py
-test/test_annotation_common.py
-test/test_annotation_export.py
-test/test_annotation_list.py
-test/test_annotation_request.py
-test/test_annotation_request_one_of.py
-test/test_annotation_request_relationships.py
-test/test_annotation_request_relationships_notes.py
-test/test_annotation_return.py
-test/test_annotation_return_one_of.py
-test/test_annotation_return_one_of1.py
-test/test_annotation_return_relationships.py
-test/test_annotation_return_relationships_notes.py
-test/test_annotations_api.py
-test/test_base_studies_post200_response.py
-test/test_base_studies_post_request.py
-test/test_base_study.py
-test/test_base_study_list.py
-test/test_base_study_return.py
-test/test_base_study_versions.py
-test/test_clone.py
-test/test_condition_base.py
-test/test_condition_list.py
-test/test_condition_request.py
-test/test_condition_return.py
-test/test_conditions_api.py
-test/test_entity.py
-test/test_image_base.py
-test/test_image_common.py
-test/test_image_list.py
-test/test_image_relationships.py
-test/test_image_request.py
-test/test_image_return.py
-test/test_images_api.py
-test/test_json_ld.py
-test/test_json_ld_context.py
-test/test_metadata.py
-test/test_nested_put_attributes.py
-test/test_note_collection_base.py
-test/test_note_collection_list.py
-test/test_note_collection_request.py
-test/test_note_collection_return.py
-test/test_note_collection_return_all_of.py
-test/test_point_base.py
-test/test_point_common.py
-test/test_point_list.py
-test/test_point_relationships.py
-test/test_point_relationships_values.py
-test/test_point_request.py
-test/test_point_return.py
-test/test_point_value.py
-test/test_points_api.py
-test/test_readable_resource_attributes.py
-test/test_resource_attributes.py
-test/test_store_api.py
-test/test_studies_api.py
-test/test_study_base.py
-test/test_study_common.py
-test/test_study_list.py
-test/test_study_request.py
-test/test_study_request_all_of.py
-test/test_study_request_relationships.py
-test/test_study_request_relationships_analyses.py
-test/test_study_return.py
-test/test_study_return_all_of.py
-test/test_study_return_all_of_studysets_inner.py
-test/test_study_return_all_of_studysets_inner_one_of.py
-test/test_study_return_relationships.py
-test/test_study_return_relationships_analyses.py
-test/test_studyset_base.py
-test/test_studyset_list.py
-test/test_studyset_request.py
-test/test_studyset_request_relationships.py
-test/test_studyset_return.py
-test/test_studyset_return_relationships.py
-test/test_studyset_return_relationships_studies.py
-test/test_studysets_api.py
-test/test_studysets_id_get404_response.py
-test/test_studysets_id_put422_response.py
-test/test_user.py
-test/test_user_api.py
-test/test_user_list.py
-test/test_user_resource_attributes.py
-test/test_userless_resource_attributes.py
-test/test_writeable_resource_attributes.py
 tox.ini
diff --git a/docs/AnalysisCommon.md b/docs/AnalysisCommon.md
index 0752705..5da99fd 100644
--- a/docs/AnalysisCommon.md
+++ b/docs/AnalysisCommon.md
@@ -8,6 +8,7 @@ Name | Type | Description | Notes
 **study** | **str** |  | [optional] 
 **entities** | [**List[Entity]**](Entity.md) |  | [optional] 
 **order** | **int** |  | [optional] 
+**metadata** | **object** |  | [optional] 
 
 ## Example
 
diff --git a/docs/AnalysisRequest.md b/docs/AnalysisRequest.md
index 13d8f34..97e7b72 100644
--- a/docs/AnalysisRequest.md
+++ b/docs/AnalysisRequest.md
@@ -15,6 +15,7 @@ Name | Type | Description | Notes
 **public** | **bool** | whether the resource is listed in public searches or not | [optional] [default to True]
 **entities** | [**List[Entity]**](Entity.md) |  | [optional] 
 **order** | **int** |  | [optional] 
+**metadata** | **object** |  | [optional] 
 
 ## Example
 
diff --git a/docs/AnalysisReturn.md b/docs/AnalysisReturn.md
index d81661d..8282131 100644
--- a/docs/AnalysisReturn.md
+++ b/docs/AnalysisReturn.md
@@ -19,6 +19,7 @@ Name | Type | Description | Notes
 **conditions** | [**AnalysisReturnRelationshipsConditions**](AnalysisReturnRelationshipsConditions.md) |  | [optional] 
 **entities** | [**List[Entity]**](Entity.md) |  | [optional] 
 **order** | **int** |  | [optional] 
+**metadata** | **object** |  | [optional] 
 
 ## Example
 
diff --git a/neurostore_sdk/models/analysis_common.py b/neurostore_sdk/models/analysis_common.py
index 3cd3017..3d41a13 100644
--- a/neurostore_sdk/models/analysis_common.py
+++ b/neurostore_sdk/models/analysis_common.py
@@ -19,7 +19,7 @@
 import json
 
 
-from typing import List, Optional
+from typing import Any, Dict, List, Optional
 from pydantic import BaseModel, StrictInt, StrictStr, conlist
 from neurostore_sdk.models.entity import Entity
 
@@ -30,7 +30,8 @@ class AnalysisCommon(BaseModel):
     study: Optional[StrictStr] = None
     entities: Optional[conlist(Entity)] = None
     order: Optional[StrictInt] = None
-    __properties = ["study", "entities", "order"]
+    metadata: Optional[Dict[str, Any]] = None
+    __properties = ["study", "entities", "order", "metadata"]
 
     class Config:
         """Pydantic configuration"""
@@ -68,6 +69,11 @@ def to_dict(self):
         if self.order is None and "order" in self.__fields_set__:
             _dict['order'] = None
 
+        # set to None if metadata (nullable) is None
+        # and __fields_set__ contains the field
+        if self.metadata is None and "metadata" in self.__fields_set__:
+            _dict['metadata'] = None
+
         return _dict
 
     @classmethod
@@ -82,7 +88,8 @@ def from_dict(cls, obj: dict) -> AnalysisCommon:
         _obj = AnalysisCommon.parse_obj({
             "study": obj.get("study"),
             "entities": [Entity.from_dict(_item) for _item in obj.get("entities")] if obj.get("entities") is not None else None,
-            "order": obj.get("order")
+            "order": obj.get("order"),
+            "metadata": obj.get("metadata")
         })
         return _obj
 
diff --git a/neurostore_sdk/models/analysis_request.py b/neurostore_sdk/models/analysis_request.py
index 8676466..d33356e 100644
--- a/neurostore_sdk/models/analysis_request.py
+++ b/neurostore_sdk/models/analysis_request.py
@@ -19,7 +19,7 @@
 import json
 
 
-from typing import List, Optional, Union
+from typing import Any, Dict, List, Optional, Union
 from pydantic import BaseModel, Field, StrictBool, StrictFloat, StrictInt, StrictStr, conlist, constr
 from neurostore_sdk.models.analysis_request_relationships_conditions import AnalysisRequestRelationshipsConditions
 from neurostore_sdk.models.analysis_request_relationships_images import AnalysisRequestRelationshipsImages
@@ -41,7 +41,8 @@ class AnalysisRequest(BaseModel):
     public: Optional[StrictBool] = Field(True, description="whether the resource is listed in public searches or not")
     entities: Optional[conlist(Entity)] = None
     order: Optional[StrictInt] = None
-    __properties = ["name", "description", "weights", "study", "images", "points", "conditions", "id", "public", "entities", "order"]
+    metadata: Optional[Dict[str, Any]] = None
+    __properties = ["name", "description", "weights", "study", "images", "points", "conditions", "id", "public", "entities", "order", "metadata"]
 
     class Config:
         """Pydantic configuration"""
@@ -98,6 +99,11 @@ def to_dict(self):
         if self.order is None and "order" in self.__fields_set__:
             _dict['order'] = None
 
+        # set to None if metadata (nullable) is None
+        # and __fields_set__ contains the field
+        if self.metadata is None and "metadata" in self.__fields_set__:
+            _dict['metadata'] = None
+
         return _dict
 
     @classmethod
@@ -120,7 +126,8 @@ def from_dict(cls, obj: dict) -> AnalysisRequest:
             "id": obj.get("id"),
             "public": obj.get("public") if obj.get("public") is not None else True,
             "entities": [Entity.from_dict(_item) for _item in obj.get("entities")] if obj.get("entities") is not None else None,
-            "order": obj.get("order")
+            "order": obj.get("order"),
+            "metadata": obj.get("metadata")
         })
         return _obj
 
diff --git a/neurostore_sdk/models/analysis_return.py b/neurostore_sdk/models/analysis_return.py
index ac56917..705e892 100644
--- a/neurostore_sdk/models/analysis_return.py
+++ b/neurostore_sdk/models/analysis_return.py
@@ -19,7 +19,7 @@
 import json
 
 from datetime import datetime
-from typing import List, Optional, Union
+from typing import Any, Dict, List, Optional, Union
 from pydantic import BaseModel, Field, StrictBool, StrictFloat, StrictInt, StrictStr, conlist, constr
 from neurostore_sdk.models.analysis_return_relationships_conditions import AnalysisReturnRelationshipsConditions
 from neurostore_sdk.models.analysis_return_relationships_images import AnalysisReturnRelationshipsImages
@@ -45,7 +45,8 @@ class AnalysisReturn(BaseModel):
     conditions: Optional[AnalysisReturnRelationshipsConditions] = None
     entities: Optional[conlist(Entity)] = None
     order: Optional[StrictInt] = None
-    __properties = ["name", "description", "weights", "created_at", "updated_at", "id", "public", "user", "username", "study", "images", "points", "conditions", "entities", "order"]
+    metadata: Optional[Dict[str, Any]] = None
+    __properties = ["name", "description", "weights", "created_at", "updated_at", "id", "public", "user", "username", "study", "images", "points", "conditions", "entities", "order", "metadata"]
 
     class Config:
         """Pydantic configuration"""
@@ -120,6 +121,11 @@ def to_dict(self):
         if self.order is None and "order" in self.__fields_set__:
             _dict['order'] = None
 
+        # set to None if metadata (nullable) is None
+        # and __fields_set__ contains the field
+        if self.metadata is None and "metadata" in self.__fields_set__:
+            _dict['metadata'] = None
+
         return _dict
 
     @classmethod
@@ -146,7 +152,8 @@ def from_dict(cls, obj: dict) -> AnalysisReturn:
             "points": AnalysisReturnRelationshipsPoints.from_dict(obj.get("points")) if obj.get("points") is not None else None,
             "conditions": AnalysisReturnRelationshipsConditions.from_dict(obj.get("conditions")) if obj.get("conditions") is not None else None,
             "entities": [Entity.from_dict(_item) for _item in obj.get("entities")] if obj.get("entities") is not None else None,
-            "order": obj.get("order")
+            "order": obj.get("order"),
+            "metadata": obj.get("metadata")
         })
         return _obj