diff --git a/pyproject.toml b/pyproject.toml
index 97685b7..3f3eb6a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -51,7 +51,8 @@ test = [
     "trustme==0.9.0"
 ]
 codegen = [
-    "ariadne-codegen @ git+https://github.com/chestm007/ariadne-codegen"  # This could break a pypi upload. Waiting on https://github.com/mirumee/ariadne-codegen/pull/413 to be merged.
+    #"ariadne-codegen>0.18.0"  # Waiting on https://github.com/mirumee/ariadne-codegen/pull/413 to be merged.
+    "zepben-ariadne-codegen==0.18.0.1"  # Waiting on https://github.com/mirumee/ariadne-codegen/pull/413 to be merged.
 ]
 
 [tool.setuptools.packages.find]
diff --git a/src/zepben/eas/client/eas_client.py b/src/zepben/eas/client/eas_client.py
index 3f41115..1f944e2 100644
--- a/src/zepben/eas/client/eas_client.py
+++ b/src/zepben/eas/client/eas_client.py
@@ -116,9 +116,9 @@ async def close(self):
         await self.http_client.aclose()
 
     @async_func
-    async def query(self, query: GraphQLQuery[T, R], *additional_fields: R, operation_name: str = None) -> T:
+    async def query(self, query: GraphQLQuery[T, R], *returned_fields: R, operation_name: str = None) -> T:
         """Execute a query against the Evolve App Server."""
-        query = query.fields(*additional_fields) if hasattr(query, "fields") else query
+        query = query.fields(*returned_fields) if hasattr(query, "fields") else query
         return await super().query(query, operation_name=operation_name)
 
     @async_func
diff --git a/src/zepben/eas/lib/generated_graphql_client/__init__.py b/src/zepben/eas/lib/generated_graphql_client/__init__.py
index f3c8fd0..57e1ef0 100644
--- a/src/zepben/eas/lib/generated_graphql_client/__init__.py
+++ b/src/zepben/eas/lib/generated_graphql_client/__init__.py
@@ -28,9 +28,11 @@
     OpenDssModelState,
     OpportunitiesNeed,
     OpportunitiesType,
+    PowerFactoryModelState,
     SectionType,
     SerializationType,
     SincalFileType,
+    SincalModelState,
     SortOrder,
     VariantFileType,
     VariantStatus,
@@ -204,6 +206,7 @@
     "PhaseRebalanceProportionsInput",
     "PowerFactoryModelGenerationSpecInput",
     "PowerFactoryModelInput",
+    "PowerFactoryModelState",
     "ProcessedDiffFilterInput",
     "ProcessedDiffSortCriteriaInput",
     "ResultSectionInput",
@@ -212,6 +215,7 @@
     "SincalFileType",
     "SincalModelGenerationSpecInput",
     "SincalModelInput",
+    "SincalModelState",
     "SortOrder",
     "StateOverlayInput",
     "StudyInput",
diff --git a/src/zepben/eas/lib/generated_graphql_client/enums.py b/src/zepben/eas/lib/generated_graphql_client/enums.py
index 218bd68..c4e5a04 100644
--- a/src/zepben/eas/lib/generated_graphql_client/enums.py
+++ b/src/zepben/eas/lib/generated_graphql_client/enums.py
@@ -165,6 +165,13 @@ class OpportunitiesType(str, Enum):
     VOLTAGESUPPORT = "VOLTAGESUPPORT"
 
 
+class PowerFactoryModelState(str, Enum):
+    COULD_NOT_START = "COULD_NOT_START"
+    CREATION = "CREATION"
+    COMPLETED = "COMPLETED"
+    FAILED = "FAILED"
+
+
 class SectionType(str, Enum):
     TABLE = "TABLE"
 
@@ -184,6 +191,14 @@ class SincalFileType(str, Enum):
     BACKEND_CONFIG = "BACKEND_CONFIG"
 
 
+class SincalModelState(str, Enum):
+    COULD_NOT_START = "COULD_NOT_START"
+    CREATION = "CREATION"
+    COMPLETED = "COMPLETED"
+    FAILED = "FAILED"
+    PARTIAL = "PARTIAL"
+
+
 class SortOrder(str, Enum):
     ASC = "ASC"
     DESC = "DESC"
diff --git a/src/zepben/eas/lib/generated_graphql_client/input_types.py b/src/zepben/eas/lib/generated_graphql_client/input_types.py
index cc17d1d..8105524 100644
--- a/src/zepben/eas/lib/generated_graphql_client/input_types.py
+++ b/src/zepben/eas/lib/generated_graphql_client/input_types.py
@@ -21,7 +21,9 @@
     IngestorRuntimeKind,
     InterventionClass,
     OpenDssModelState,
+    PowerFactoryModelState,
     SectionType,
+    SincalModelState,
     SortOrder,
 )
 
@@ -227,7 +229,7 @@ class GetPowerFactoryModelTemplatesSortCriteriaInput(BaseModel):
 class GetPowerFactoryModelsFilterInput(BaseModel):
     is_public: Optional[bool] = Field(alias="isPublic", default=None)
     name: Optional[str] = None
-    state: Optional[list[str]] = None
+    state: Optional[list[PowerFactoryModelState]] = None
 
 
 class GetPowerFactoryModelsSortCriteriaInput(BaseModel):
@@ -251,7 +253,7 @@ class GetSincalModelPresetsSortCriteriaInput(BaseModel):
 class GetSincalModelsFilterInput(BaseModel):
     is_public: Optional[bool] = Field(alias="isPublic", default=None)
     name: Optional[str] = None
-    state: Optional[list[str]] = None
+    state: Optional[list[SincalModelState]] = None
 
 
 class GetSincalModelsSortCriteriaInput(BaseModel):